Merge remote-tracking branch 'origin/rel15x' into rel15x
o.c.sds.cosyrules: Anpassung an DAL2 Datentypen
o.c.sds.cosyrules: Anpassung an DAL2 Datentypen
o.c.application.xmlrpc.server: Convert EpicsEnum to Double
Merge branch 'develop' into rel15x
o.c.ams.performancetesttool: Replaced dependency DepartmentDecision /
FilterHandler
o.c.(n)ams: Moved (N)AMS plugins from branch ams_develop to rel15x.
Merge branch 'rel15x' of github.com:Desy-extern/cs-studio into rel15x
o.c.(n)ams: Created new product configurations
Merge branch 'develop' into rel15x
o.c.sds.ui: Darstellung erweitert und überarbeitet.
Merge remote-tracking branch 'Desy-extern/rel15x' into rel15x
Merge commit '6ac0bd7' into rel15x