chiark - git - ianmdlvl - cura.git/commit - resources/locale/ko/LC_MESSAGES/Cura.po

chiark / gitweb /

~ianmdlvl / cura.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c8fe376 e8d361b)

author	Youness Alaoui <kakaroto@kakaroto.homelinux.net>
	Fri, 6 Mar 2015 17:49:10 +0000 (12:49 -0500)
committer	Youness Alaoui <kakaroto@kakaroto.homelinux.net>
	Fri, 6 Mar 2015 17:49:10 +0000 (12:49 -0500)
commit	11df3f11afd58b8d612879c9da64e16d204adb84
tree	90d74cb3fc6b32ccff3b3d3dd77c6567a025cfb1	tree \| snapshot
parent	c8fe3761b1e28770e0895733c409c581830e1112	commit \| diff
parent	e8d361b03633d6b9514af0142e614b705aacb03a	commit \| diff

Merge tag '15.01-RC8' into upstream

Conflicts:
Cura/gui/sceneView.py
Cura/util/profile.py
Cura/util/sliceEngine.py
package.sh
resources/meshes/ultimaker2_platform.stl

Cura/gui/preferencesDialog.py	diff1 \|	diff2 \|	blob \| history
Cura/gui/sceneView.py	diff1 \|	diff2 \|	blob \| history
Cura/gui/util/openglGui.py	diff1 \|	diff2 \|	blob \| history
Cura/util/bigDataStorage.py	diff1 \|	diff2 \|	blob \| history
Cura/util/gcodeInterpreter.py	diff1 \|	diff2 \|	blob \| history
Cura/util/profile.py	diff1 \|	diff2 \|	blob \| history
Cura/util/sliceEngine.py	diff1 \|	diff2 \|	blob \| history
README.md	diff1 \|	diff2 \|	blob \| history
package.sh	diff1 \|	diff2 \|	blob \| history
scripts/win32/installer.nsi	diff1 \|	diff2 \|	blob \| history

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