summaryrefslogtreecommitdiffstats
path: root/src/fbgui.conf
diff options
context:
space:
mode:
authorJonathan Bauer2011-03-10 16:10:42 +0100
committerJonathan Bauer2011-03-10 16:10:42 +0100
commit550a86ff4852d247d07c35c4a3d6730b6ffa52e7 (patch)
tree4735a792e713b877ffac528f91805d6c129c8d7d /src/fbgui.conf
parenttest function that returns a json, use: fbgui.getNames() (diff)
parent now the getAllInfo() method works. We just return a String (diff)
downloadfbgui-550a86ff4852d247d07c35c4a3d6730b6ffa52e7.tar.gz
fbgui-550a86ff4852d247d07c35c4a3d6730b6ffa52e7.tar.xz
fbgui-550a86ff4852d247d07c35c4a3d6730b6ffa52e7.zip
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts: src/sysInfo.cpp
Diffstat (limited to 'src/fbgui.conf')
-rw-r--r--src/fbgui.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fbgui.conf b/src/fbgui.conf
index 2319dbd..99d7d0e 100644
--- a/src/fbgui.conf
+++ b/src/fbgui.conf
@@ -1,3 +1,3 @@
[default]
-url=http://132.230.4.3/test.html
+url=http://132.230.4.3/mockup/openslx.php
downloadDirectory=/downloads