Jan Steemann 587c2aef64 issue #744 ... Conflicts: lib/ApplicationServer/ApplicationServer.cpp		2014-01-23 09:58:18 +01:00
..
ApplicationFeature.cpp	updated disclaimer	2013-03-13 17:03:18 +01:00
ApplicationFeature.h	updated disclaimer	2013-03-13 17:03:18 +01:00
ApplicationServer.cpp	issue #744	2014-01-23 09:58:18 +01:00
ApplicationServer.h	Merge remote-tracking branch 'origin/1.4' into devel	2013-12-30 17:27:17 +01:00