diff options
author | Niklas Goby | 2011-04-18 09:43:34 +0200 |
---|---|---|
committer | Niklas Goby | 2011-04-18 09:43:34 +0200 |
commit | d113dab715cea7e6f3da0a0a6e650298a6acc032 (patch) | |
tree | 65873adce9fa6401026b1b4c89f12a1e8868e3c2 /fbgui.conf | |
parent | started to write a function for getting all available network (diff) | |
parent | uniformed formatting... (diff) | |
download | fbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.tar.gz fbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.tar.xz fbgui-d113dab715cea7e6f3da0a0a6e650298a6acc032.zip |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts:
src/sysinfo.h
Diffstat (limited to 'fbgui.conf')
-rw-r--r-- | fbgui.conf | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,5 +2,5 @@ pbs_url=http://132.230.4.27 download_directory=/tmp/fbgui update_interval=5 -file_trigger=/tmp/fbgui/trigger +file_trigger=/tmp/fbgui_trigger serial_location=/serial |