Merge branch 'master' of projects.qi-hardware.com:gmenu2x into install_locations

Conflicts:
	data/platform/nanonote/sections/terminals/ash
	src/gmenu2x.cpp
	src/surface.cpp
This commit is contained in:
Ayla committed 2011-06-02 12:16:26 +02:00
commit ef4b012026
38 files changed
+509 -654

No files matched your search

@@ -1 +1 @@
open.png
a.png