diff --git a/slsDetectorGui/Makefile b/slsDetectorGui/Makefile index 90ca37a00..07b1b8747 100644 --- a/slsDetectorGui/Makefile +++ b/slsDetectorGui/Makefile @@ -55,7 +55,7 @@ doc: htmldoc: cd manual && $(MAKE) html DESTDIR=$(DOCDIR) -$(PROG): Makefile $(DIR) src/*.cpp include/*.h slsDetectorPlotting/include/*.h slsDetectorPlotting/src/*.cxx forms/include/*.h +$(PROG): Makefile $(DIR) src/*.cpp include/*.h slsDetectorPlotting/include/*.h slsDetectorPlotting/src/*.cxx # forms/include/*.h $(MAKE) -f Makefile.gui SLSDETLIB=$(DESTDIR) DESTDIR=$(DESTDIR) SUBLIBS='$(LDFLAGDET)' INCLUDES='$(INCLUDES)' LIBDIR='$(LIBDIR)' guiclient: diff --git a/slsDetectorGui/gitInfo.txt b/slsDetectorGui/gitInfo.txt index 5cf61d3fa..9c579bfc6 100644 --- a/slsDetectorGui/gitInfo.txt +++ b/slsDetectorGui/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorGui URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_gui.git -Repsitory UUID: 30b27420ac4b43a80573d794009e3ee135f8d7f3 -Revision: 405 +Repsitory UUID: fb43f6d8d9f933472bc04dd482911a54cb7e021c +Revision: 406 Branch: developer Last Changed Author: Dhanya_Maliakal -Last Changed Rev: 405 -Last Changed Date: 2017-07-12 10:37:02.000000002 +0200 ./Makefile.gui +Last Changed Rev: 406 +Last Changed Date: 2017-07-13 14:38:07.000000002 +0200 ./Makefile.gui diff --git a/slsDetectorGui/include/gitInfoGui.h b/slsDetectorGui/include/gitInfoGui.h index bdadbb4d3..c733ddf31 100644 --- a/slsDetectorGui/include/gitInfoGui.h +++ b/slsDetectorGui/include/gitInfoGui.h @@ -1,11 +1,11 @@ //#define SVNPATH "" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_gui.git" //#define SVNREPPATH "" -#define SVNREPUUID "30b27420ac4b43a80573d794009e3ee135f8d7f3" -//#define SVNREV 0x405 +#define SVNREPUUID "fb43f6d8d9f933472bc04dd482911a54cb7e021c" +//#define SVNREV 0x406 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "Dhanya_Maliakal" -#define SVNREV 0x405 -#define SVNDATE 0x20170712 +#define SVNREV 0x406 +#define SVNDATE 0x20170713 //