chiark / gitweb /
Merge branch 'v2-toolheads' into devel
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:26:16 +0000 (16:26 -0400)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:26:16 +0000 (16:26 -0400)
1  2 
Cura/gui/mainWindow.py
Cura/util/profile.py

Simple merge
Simple merge