chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c00f58e bdd5183)
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)
1  2 
Cura/util/resources.py patch | diff1 | diff2 | blob | history

diff --cc Cura/util/resources.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.