chiark / gitweb /
Fix localization merge.
authordaid <daid303@gmail.com>
Mon, 16 Sep 2013 13:23:26 +0000 (15:23 +0200)
committerdaid <daid303@gmail.com>
Mon, 16 Sep 2013 13:23:26 +0000 (15:23 +0200)
commit0b48ed7f2f91386542604ff94e7ae878db2e1269
tree7c308646cf0d54b67a535799e99219b4932e4548
parenta43597ad0319e49f5b2cbef916688d15f8e5795c
parente3f21ac4a75936a2852b679062d524500bc9ebaf
Fix localization merge.
Cura/gui/configWizard.py
Cura/gui/mainWindow.py
Cura/gui/printWindow.py
Cura/gui/sceneView.py
Cura/gui/simpleMode.py
Cura/gui/tools/youmagineGui.py
Cura/util/profile.py
Cura/util/resources.py