Diffusion openhab2-addons 42a26d600c6c

openhab2 into clinique…
42a26d600c6cUnpublished
Actions

Authored by Kai Kreuzer <kai@openhab.org> on Mar 23 2015, 6:43 PM.

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.
Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'freebox' of https://github.com/clinique/openhab2 into clinique-freebox

Conflicts:
AUTHORS
addons/binding/pom.xml
targetplatform/openHAB_Runtime.launch

Signed-off-by: Kai Kreuzer <kai@openhab.org> (github: @kaikreuzer)

Details

Committed

Kai Kreuzer <kai@openhab.org>

Mar 23 2015, 6:43 PM

Parents

R40:1daf8eaa2431: Squashing all commits Initial Contribution of the Freebox 2.0 binding
R40:63d70f86b8a0: Merge pull request #155 from cdjackson/habmin-dashboard

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

	Commit			Author	Details	Committed
	1daf8eaa2431			sysadmin/Gaël L'hopital	Squashing all commits Initial Contribution of the Freebox 2.0 binding	Mar 23 2015

Changes (40)

		Path
M		AUTHORS
A	(dir)	addons/binding/org.openhab.binding.freebox/
A		addons/binding/org.openhab.binding.freebox/.classpath
P		addons/binding/org.openhab.binding.freebox/.project Copied from addons/binding/org.openhab.binding.network/.project
A	(dir)	addons/binding/org.openhab.binding.freebox/.settings/
P		addons/binding/org.openhab.binding.freebox/.settings/org.eclipse.pde.core.prefs Copied from addons/binding/org.openhab.binding.max.test/.settings/org.eclipse.pde.core.prefs
A	(dir)	addons/binding/org.openhab.binding.freebox/ESH-INF/
A	(dir)	addons/binding/org.openhab.binding.freebox/ESH-INF/binding/
P		addons/binding/org.openhab.binding.freebox/ESH-INF/binding/binding.xml Copied from addons/binding/org.openhab.binding.network/ESH-INF/binding/binding.xml
A	(dir)	addons/binding/org.openhab.binding.freebox/ESH-INF/thing/
A		addons/binding/org.openhab.binding.freebox/ESH-INF/thing/thing-types.xml
A	(dir)	addons/binding/org.openhab.binding.freebox/META-INF/
A		addons/binding/org.openhab.binding.freebox/META-INF/MANIFEST.MF
A	(dir)	addons/binding/org.openhab.binding.freebox/OSGI-INF/
P		addons/binding/org.openhab.binding.freebox/OSGI-INF/FreeboxHandlerFactory.xml Copied from addons/binding/org.openhab.binding.network/OSGI-INF/NetworkHandlerFactory.xml
A		addons/binding/org.openhab.binding.freebox/build.properties
A	(dir)	addons/binding/org.openhab.binding.freebox/lib/
A		addons/binding/org.openhab.binding.freebox/lib/freeboxos-client-0.3.5.jar
A		addons/binding/org.openhab.binding.freebox/lib/httpclient-4.3.1.jar
A		addons/binding/org.openhab.binding.freebox/lib/httpcore-4.3.jar
A		addons/binding/org.openhab.binding.freebox/lib/httpmime-4.3.1.jar
A		addons/binding/org.openhab.binding.freebox/lib/jackson-core-asl-1.9.13.jar
A		addons/binding/org.openhab.binding.freebox/lib/jackson-mapper-asl-1.9.13.jar
A		addons/binding/org.openhab.binding.freebox/lib/json-simple-1.1.jar
P		addons/binding/org.openhab.binding.freebox/pom.xml Copied from addons/binding/org.openhab.binding.network/pom.xml
A	(dir)	addons/binding/org.openhab.binding.freebox/src/
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/java/
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/java/org/
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/
A		addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/FreeboxBindingConstants.java
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/config/
A		addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/config/FreeboxServerConfiguration.java
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/handler/
A		addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/handler/FreeboxHandler.java
A	(dir)	addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/
P		addons/binding/org.openhab.binding.freebox/src/main/java/org/openhab/binding/freebox/internal/FreeboxHandlerFactory.java Copied from addons/binding/org.openhab.binding.network/src/main/java/org/openhab/binding/network/internal/NetworkHandlerFactory.java
M		addons/binding/pom.xml