chiark / gitweb /
Merge remote-tracking branch 'upstream/master' into macosx
authorIlya Kulakov <kulakov.ilya@gmail.com>
Wed, 5 Dec 2012 17:33:55 +0000 (00:33 +0700)
committerIlya Kulakov <kulakov.ilya@gmail.com>
Wed, 5 Dec 2012 17:33:55 +0000 (00:33 +0700)
commit9f3d727817796e3aef04c5193e4b48ed09f19383
tree2c3b3ef405fbb9a7c45221ac33d506a4ec035c45
parent1d42ce8afc4cb51099eb0873421e89682c441f17
parent2081a9cc9a808f9fa0f53f89125ed1a0c297394d
Merge remote-tracking branch 'upstream/master' into macosx

Conflicts:
Cura/gui/configWizard.py
Cura/gui/mainWindow.py
Cura/gui/opengl.py
Cura/gui/printWindow.py
scripts/osx64/Cura.app/Contents/MacOS/Cura
Cura/gui/configWizard.py
Cura/gui/mainWindow.py
Cura/gui/opengl.py
Cura/gui/printWindow.py