projects
/
naja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0bd160d
1fd94d2
)
Merge branch 'master' into No_movement_mode
author
Jeremy Thurgood
<firxen@gmail.com>
Thu, 15 May 2014 17:11:33 +0000
(19:11 +0200)
committer
Jeremy Thurgood
<firxen@gmail.com>
Thu, 15 May 2014 17:11:33 +0000
(19:11 +0200)
1
2
naja/widgets/tile.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
naja/widgets/tile.py
Simple merge