chiark / gitweb /
Merge branch 'master' into SteamEngine
authordaid303 <daid303@gmail.com>
Mon, 22 Apr 2013 12:55:30 +0000 (14:55 +0200)
committerdaid303 <daid303@gmail.com>
Mon, 22 Apr 2013 12:55:30 +0000 (14:55 +0200)
commitc794a6ffc57f908667256b7952a529e9615f94ef
treed5eb8cdc01f6e504e56ecb4b5cdde7d7b6294216
parent5e6d433e5c9581dcfdd0a06ea353a7636949f733
parent4f08d4a0f530966e7169039dfc79c9c6f3c8524f
Merge branch 'master' into SteamEngine

Conflicts:
package.sh
Cura/gui/mainWindow.py
Cura/gui/preferencesDialog.py