diff options
| author | Jonathan Bauer | 2011-02-01 16:49:59 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2011-02-01 16:49:59 +0100 |
| commit | cbd71522f60cc2058634b6fd9068e5ba9af7b779 (patch) | |
| tree | ac74c5ff47339c498183c4dd3d050cd154a6923a /src/fbbrowser.h | |
| parent | deleted .metadata (diff) | |
| parent | i added jsObject (diff) | |
| download | fbgui-cbd71522f60cc2058634b6fd9068e5ba9af7b779.tar.gz fbgui-cbd71522f60cc2058634b6fd9068e5ba9af7b779.tar.xz fbgui-cbd71522f60cc2058634b6fd9068e5ba9af7b779.zip | |
Merge branch 'master' of git.openslx.org:lsfks/master-teamprojekt/fbgui
Conflicts:
.metadata/.log
.metadata/.plugins/org.eclipse.cdt.core/.log
.metadata/.plugins/org.eclipse.cdt.core/fbbrowser.1294830673062.pdom
.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs
.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv
src/fbgui.pro
Diffstat (limited to 'src/fbbrowser.h')
| -rw-r--r-- | src/fbbrowser.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/fbbrowser.h b/src/fbbrowser.h index b5c84e9..c844002 100644 --- a/src/fbbrowser.h +++ b/src/fbbrowser.h @@ -42,6 +42,7 @@ private slots: void httpReqFinished(); void addJSObject(); void saveData(); + void getSysInfo(); signals: void signalQuitAll(); |