diff options
| author | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-06 20:31:47 +0300 |
|---|---|---|
| committer | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-03-06 20:31:47 +0300 |
| commit | c8fe3761b1e28770e0895733c409c581830e1112 (patch) | |
| tree | 09558b06503e5a9ed2c298f4427b439f0a2f15bb /README.md | |
| parent | 81831e568dc116305da0ebc06b6f81e7e5abd070 (diff) | |
| parent | 27fe37595c12315e930fe52f683b19d35ec31844 (diff) | |
Merge tag '15.01-RC7' into upstream
Conflicts:
Cura/gui/firmwareInstall.py
Cura/gui/mainWindow.py
Cura/gui/sceneView.py
Cura/util/profile.py
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions