diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-10 00:39:36 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-10 00:39:36 +0200 |
commit | 032fe5ede7cc937a84b4c7477dabe007a5050e9d (patch) | |
tree | 42ad8f4aa1684c5ae922260624496d613a5b9c0a /ishtar_common/menu_base.py | |
parent | bb8e1fc4dc37703c604ac9d2f62fc2f8351ed8aa (diff) | |
parent | e2e7eac3654dc1a55c9b2265028ce0cc9975c2e6 (diff) | |
download | Ishtar-032fe5ede7cc937a84b4c7477dabe007a5050e9d.tar.bz2 Ishtar-032fe5ede7cc937a84b4c7477dabe007a5050e9d.zip |
Merge branch 'stable'
Conflicts:
Makefile.example
Diffstat (limited to 'ishtar_common/menu_base.py')
0 files changed, 0 insertions, 0 deletions