chiark / gitweb /
~ianmdlvl / cura.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 895fe2a 7bc8d33)
Merge branch 'master' of github.com:daid/SkeinPyPy
authorDaid <daid303@gmail.com>
Sat, 24 Mar 2012 09:52:00 +0000 (10:52 +0100)
committerDaid <daid303@gmail.com>
Sat, 24 Mar 2012 09:52:00 +0000 (10:52 +0100)
1  2 
SkeinPyPy/newui/mainWindow.py patch | diff1 | diff2 | blob | history

diff --cc SkeinPyPy/newui/mainWindow.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.