Merge branch 'master' into No_movement_mode
authorJeremy Thurgood <firxen@gmail.com>
Thu, 15 May 2014 17:11:33 +0000 (19:11 +0200)
committerJeremy Thurgood <firxen@gmail.com>
Thu, 15 May 2014 17:11:33 +0000 (19:11 +0200)
commit0cef06f581d48315a59a19ac06ca1d2be14cbb4c
treee84b8b7311e76433265ee97cab2ffe71089a26af
parent0bd160dc700e55e996a1ad89e9daf6cdc00c88d8
parent1fd94d28fdfa2331a025ce3b0d0f6fecb5af3324
Merge branch 'master' into No_movement_mode
naja/widgets/tile.py