chiark / gitweb /
Merge remote-tracking branch 'origin/master' into AO-build
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 20 Jan 2015 16:55:01 +0000 (11:55 -0500)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Tue, 20 Jan 2015 16:55:01 +0000 (11:55 -0500)
commit28e73ae29968938840fe9e8cfd0f41151a3a4250
tree7c882362b9d4e7ad3233caed96ed32336bac9ec6
parente4e9c6f77fd1d146b57c32605c04f5de08f29a89
parent8ec6eea68d54b78d7b947ed714ad8bdf2b916ff5
Merge remote-tracking branch 'origin/master' into AO-build

Conflicts:
Cura/gui/preferencesDialog.py
Cura/util/profile.py
Cura/gui/aboutWindow.py
Cura/util/profile.py