chiark - git - ianmdlvl - cura.git/commit

chiark / gitweb /

~ianmdlvl / cura.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8ec6eea 712fe87)

author	Youness Alaoui <kakaroto@kakaroto.homelinux.net>
	Tue, 20 Jan 2015 18:48:11 +0000 (13:48 -0500)
committer	Youness Alaoui <kakaroto@kakaroto.homelinux.net>
	Tue, 20 Jan 2015 18:48:11 +0000 (13:48 -0500)
commit	2f894755ed89ae77e4d3b88c66feb4936436ba7d
tree	a6b180933107909885c3bed42ad0a678c054165d	tree \| snapshot
parent	8ec6eea68d54b78d7b947ed714ad8bdf2b916ff5	commit \| diff
parent	712fe87b4a0e0fe4242aa620cc36ff0efb039f03	commit \| diff

Merge branch 'upstream'

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

Cura/gui/aboutWindow.py	diff1 \|	diff2 \|	blob \| history
Cura/gui/app.py	diff1 \|	diff2 \|	blob \| history
Cura/gui/configBase.py	diff1 \|	diff2 \|	blob \| history
Cura/gui/mainWindow.py	diff1 \|	diff2 \|	blob \| history
Cura/gui/preferencesDialog.py	diff1 \|	diff2 \|	blob \| history
Cura/gui/printWindow.py	diff1 \|	diff2 \|	blob \| history
Cura/gui/sceneView.py	diff1 \|	diff2 \|	blob \| history
Cura/util/profile.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.