diff options
| author | Ilya Kulakov <kulakov.ilya@gmail.com> | 2012-12-05 21:33:55 +0400 |
|---|---|---|
| committer | Ilya Kulakov <kulakov.ilya@gmail.com> | 2012-12-05 21:33:55 +0400 |
| commit | 9f3d727817796e3aef04c5193e4b48ed09f19383 (patch) | |
| tree | 2c3b3ef405fbb9a7c45221ac33d506a4ec035c45 /requirements_darwin.txt | |
| parent | 1d42ce8afc4cb51099eb0873421e89682c441f17 (diff) | |
| parent | 2081a9cc9a808f9fa0f53f89125ed1a0c297394d (diff) | |
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
Diffstat (limited to 'requirements_darwin.txt')
0 files changed, 0 insertions, 0 deletions