panni 137cb6bb45 Merge branch 'recently-added' into menu-more ...

Conflicts:
	Contents/Code/interface/menu.py
	Contents/Code/support/items.py

2015-11-08 05:27:07 +01:00

..

__init__.py

remove reset settings; add basic GUI; add artwork, defaults;

2015-10-24 16:07:35 +02:00

menu.py

Merge branch 'recently-added' into menu-more

2015-11-08 05:27:07 +01:00