Kai Kreuzer d4c09c607a Merge branch 'Bug428193' of https://github.com/OLibutzki/smarthome into OLibutzki-Bug428193 ... Signed-off-by: Kai Kreuzer <kai@openhab.org> Conflicts: bundles/model/org.eclipse.smarthome.model.script.tests/META-INF/MANIFEST.MF targetplatform/smarthome.target		2014-06-10 22:11:01 +02:00
..
org.eclipse.smarthome.designer.core	[Bug 428193] Improved Guice injection	2014-05-15 18:06:59 +02:00
org.eclipse.smarthome.designer.ui	#434003 - Modularize main configuration file - fixed designer integration	2014-06-09 22:45:43 +02:00
pom.xml	initial contribution - CQ 7807	2014-01-10 15:53:28 +01:00