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 /src/fbgui.qrc | |
| 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 'src/fbgui.qrc')
| -rw-r--r-- | src/fbgui.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/fbgui.qrc b/src/fbgui.qrc index bb25211..10a8bd6 100644 --- a/src/fbgui.qrc +++ b/src/fbgui.qrc @@ -7,5 +7,6 @@ <file>html/style.css</file> <file>html/preload.html</file> <file>html/bg.png</file> + <file>html/preload-debug.html</file> </qresource> </RCC> |