1
0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2025-04-21 12:27:27 +03:00

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
2011-06-02 12:16:26 +02:00
38 changed files with 509 additions and 654 deletions

View File

@@ -30,6 +30,7 @@
#include "inputmanager.h"
#include "asfont.h"
#include "surface.h"
#include "powersaver.h"
#include <iostream>
#include <string>
@@ -131,6 +132,7 @@ private:
usbnet,
samba,
web;
string ip, defaultgw, lastSelectorDir;
int lastSelectorElement;
void readConfig();