diff options
| author | admin (centauri.fritz.box) <puppet@mx.buetow.org> | 2014-06-30 23:29:34 +0200 |
|---|---|---|
| committer | admin (centauri.fritz.box) <puppet@mx.buetow.org> | 2014-06-30 23:29:34 +0200 |
| commit | 813ee1984130c44f737f27426cc8414d19cf3bd9 (patch) | |
| tree | 737daaeefa0ee1f2d66821821de489b70522db37 /s_conf.cpp | |
| parent | 332d7b2107833018b3ef67b64ffe121bff1ef4fb (diff) | |
| parent | 7ead5b7a9ea99a3e0f1459187b3262f7054f0126 (diff) | |
Merge remote-tracking branch 'remotes/github/0.5' into 0.50.5
Diffstat (limited to 's_conf.cpp')
| -rw-r--r-- | s_conf.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/s_conf.cpp b/s_conf.cpp new file mode 100644 index 0000000..ea1c05a --- /dev/null +++ b/s_conf.cpp @@ -0,0 +1,10 @@ +#ifndef GCON_CXX +#define GCON_CXX + +#include "s_conf.h" + +using namespace std; + +conf* s_conf::obj; + +#endif |