chiark / gitweb /
~ianmdlvl / cura.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2fbb3b3 af83361)
Merge tag '14.12' into upstream lulzbot-14.12-rc1
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Thu, 15 Jan 2015 19:19:24 +0000 (14:19 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Thu, 15 Jan 2015 19:19:24 +0000 (14:19 -0500)
commit712fe87b4a0e0fe4242aa620cc36ff0efb039f03
tree31b69b723336d004addc79654b7c02fb33616612tree | snapshot
parent2fbb3b352e0077948073a1204daddb65c5a3e75ccommit | diff
parentaf833610f878f71c7b0a36b34febfc70ae82ed46commit | diff
Merge tag '14.12' into upstream

Conflicts:
Cura/gui/app.py
Cura/gui/configWizard.py
Cura/gui/firmwareInstall.py
Cura/util/bigDataStorage.py
Cura/util/profile.py
package.sh
Cura/gui/printWindow.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.