diff options
| author | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
|---|---|---|
| committer | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
| commit | e169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch) | |
| tree | ae9e92c7e885791c7f47645184070cbcd441ab94 /src/FbTk/Resource.hh | |
| parent | c82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff) | |
| parent | 91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff) | |
| download | fluxbox_paul-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip fluxbox_paul-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2 | |
Merge branch 'master' into to_push
Diffstat (limited to 'src/FbTk/Resource.hh')
| -rw-r--r-- | src/FbTk/Resource.hh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh index e9c3ac9..bfdcdca 100644 --- a/src/FbTk/Resource.hh +++ b/src/FbTk/Resource.hh | |||
| @@ -145,6 +145,7 @@ protected: | |||
| 145 | 145 | ||
| 146 | private: | 146 | private: |
| 147 | static bool m_init; | 147 | static bool m_init; |
| 148 | |||
| 148 | ResourceList m_resourcelist; | 149 | ResourceList m_resourcelist; |
| 149 | 150 | ||
| 150 | XrmDatabaseHelper *m_database; | 151 | XrmDatabaseHelper *m_database; |