merged from root6. Compiles but has issues with DKS linking yet.

This commit is contained in:
2017-05-15 21:30:42 +02:00
334 changed files with 27556 additions and 4414 deletions
+2 -2
View File
@@ -305,9 +305,9 @@ Int_t musrFT_parse_options(Int_t argc, Char_t *argv[], musrFT_startup_param &sta
tstr = argv[i];
if (tstr.BeginsWith("--version")) {
#ifdef HAVE_CONFIG_H
cout << endl << "musrFT version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl;
cout << endl << "musrFT version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl;
#else
cout << endl << "musrFT git-rev: " << GIT_REVISION << endl << endl;
cout << endl << "musrFT git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl;
#endif
return 1;
} else if (tstr.BeginsWith("--help")) {