Merge fallen changes

This commit is contained in:
Eduardo Bart
2012-07-14 14:17:03 -03:00
27 changed files with 889 additions and 359 deletions

View File

@@ -57,6 +57,7 @@ public:
std::string getBuildRevision() { return BUILD_REVISION; }
std::string getBuildCommit() { return BUILD_COMMIT; }
std::string getBuildType() { return BUILD_TYPE; }
std::string getBuildArch() { return BUILD_ARCH; }
std::string getStartupOptions() { return m_startupOptions; }
protected: