chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
31cbf5e
ef0d96a
)
Merge branch 'master' of github.com:daid/Cura
author
Daid
<daid303@gmail.com>
Thu, 21 Jun 2012 13:03:47 +0000
(15:03 +0200)
committer
Daid
<daid303@gmail.com>
Thu, 21 Jun 2012 13:03:47 +0000
(15:03 +0200)
1
2
Cura/gui/simpleMode.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Cura/gui/simpleMode.py
Simple merge