chiark / gitweb /
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
authordaid <daid303@gmail.com>
Wed, 7 Jan 2015 13:58:08 +0000 (14:58 +0100)
committerdaid <daid303@gmail.com>
Wed, 7 Jan 2015 13:58:08 +0000 (14:58 +0100)
commit66075b0f2e039b240c0aa3a2027f6d061f501e32
treea72fc61314ae075a91ebb3a95c81f4be6c8ef1b6
parente683b5f3c7a0f4da308ff98f6aed721e7caa5b70
parent6b2c7e2a8910b6e74bdb3e57f22e25b55bcb6aa8
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

Conflicts:
Cura/gui/util/engineResultView.py
Cura/gui/util/engineResultView.py