projects / naja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4bc519a d3e4bdd)
Merge branch 'master' of git://ctpug.org.za/naja
authorDavid Sharpe <decoydavid@gmail.com>
Sat, 17 May 2014 21:48:59 +0000 (23:48 +0200)
committerDavid Sharpe <decoydavid@gmail.com>
Sat, 17 May 2014 21:48:59 +0000 (23:48 +0200)
1  2 
naja/widgets/info_area.py patch | diff1 | diff2 | blob | history

diff --cc naja/widgets/info_area.py
Simple merge
Robolock-II: A game about 8 bits for pyweek 18