chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9e01631
d3ba701
)
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
author
daid
<daid303@gmail.com>
Tue, 24 Sep 2013 15:20:33 +0000
(17:20 +0200)
committer
daid
<daid303@gmail.com>
Tue, 24 Sep 2013 15:20:33 +0000
(17:20 +0200)
1
2
Cura/gui/mainWindow.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Cura/gui/mainWindow.py
Simple merge