chiark / gitweb /
Merge branch 'master' into AO-build
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Thu, 29 Jan 2015 17:42:10 +0000 (12:42 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Thu, 29 Jan 2015 17:42:10 +0000 (12:42 -0500)
1  2 
Cura/gui/aboutWindow.py
package.sh

Simple merge
diff --cc package.sh
Simple merge