Skip to content

Commit

Permalink
Merge pull request #132 from Negusbuk/master
Browse files Browse the repository at this point in the history
various fixes and improvements of pump station control
  • Loading branch information
Negusbuk authored Jul 18, 2018
2 parents 9d9e629 + 7d87cbb commit ee5fc65
Show file tree
Hide file tree
Showing 15 changed files with 470 additions and 130 deletions.
4 changes: 2 additions & 2 deletions .pydevproject
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python 3.6.2</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.6</pydev_property>
</pydev_project>
12 changes: 12 additions & 0 deletions licence.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2011-2017 - The DESY CMS Group //
// All rights reserved //
// //
// The CMStkModLab source code is licensed under the GNU GPL v3.0. //
// You have the right to modify and/or redistribute this source code //
// under the terms specified in the license, which may be found online //
// at http://www.gnu.org/licenses or at License.txt. //
// //
/////////////////////////////////////////////////////////////////////////////////

2 changes: 1 addition & 1 deletion pumpstation/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ NOPUMPSTATION = @nopumpstation@
USEFAKEDEVICES= @usefakedevices@

subdirs = daemon controller app analysis
installsubdirs = daemon website analysis
installsubdirs = daemon controller website analysis

all:
@for dir in $(subdirs); do (cd $$dir; make); done
Expand Down
Loading

0 comments on commit ee5fc65

Please sign in to comment.