chiark / gitweb /
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
authordaid <daid303@gmail.com>
Fri, 29 Aug 2014 14:42:00 +0000 (16:42 +0200)
committerdaid <daid303@gmail.com>
Fri, 29 Aug 2014 14:42:00 +0000 (16:42 +0200)
commitf222c020a8bb83d4c040be51a640907094d746a0
treedaf8757b57ef12bf1819e86e92ebdc8ca5c2b816
parentc00f58e4c35858a33a28132de312754b6ac7b3bc
parentbdd5183d314969a288f21124a94986b7a7724a2b
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
Cura/util/resources.py