Fixed merge issues
This commit is contained in:
parent
81a85320a2
commit
09ae1b2667
37 changed files with 22 additions and 24 deletions
0
plugins/raspberry/build.xml → plugins/hal-raspberry/build.xml
Executable file → Normal file
0
plugins/raspberry/build.xml → plugins/hal-raspberry/build.xml
Executable file → Normal file
0
plugins/raspberry/lib/pi4j-core-1.1.jar → plugins/hal-raspberry/lib/pi4j-core-1.1.jar
Executable file → Normal file
0
plugins/raspberry/lib/pi4j-core-1.1.jar → plugins/hal-raspberry/lib/pi4j-core-1.1.jar
Executable file → Normal file
0
plugins/raspberry/lib/pi4j-device-1.1.jar → plugins/hal-raspberry/lib/pi4j-device-1.1.jar
Executable file → Normal file
0
plugins/raspberry/lib/pi4j-device-1.1.jar → plugins/hal-raspberry/lib/pi4j-device-1.1.jar
Executable file → Normal file
0
plugins/raspberry/lib/pi4j-gpio-extension-1.1.jar → plugins/hal-raspberry/lib/pi4j-gpio-extension-1.1.jar
Executable file → Normal file
0
plugins/raspberry/lib/pi4j-gpio-extension-1.1.jar → plugins/hal-raspberry/lib/pi4j-gpio-extension-1.1.jar
Executable file → Normal file
0
plugins/raspberry/lib/pi4j-service-1.1.jar → plugins/hal-raspberry/lib/pi4j-service-1.1.jar
Executable file → Normal file
0
plugins/raspberry/lib/pi4j-service-1.1.jar → plugins/hal-raspberry/lib/pi4j-service-1.1.jar
Executable file → Normal file
0
plugins/raspberry/lib/pi4j.LICENSE.txt → plugins/hal-raspberry/lib/pi4j.LICENSE.txt
Executable file → Normal file
0
plugins/raspberry/lib/pi4j.LICENSE.txt → plugins/hal-raspberry/lib/pi4j.LICENSE.txt
Executable file → Normal file
0
plugins/raspberry/lib/pi4j.NOTICE.txt → plugins/hal-raspberry/lib/pi4j.NOTICE.txt
Executable file → Normal file
0
plugins/raspberry/lib/pi4j.NOTICE.txt → plugins/hal-raspberry/lib/pi4j.NOTICE.txt
Executable file → Normal file
0
plugins/raspberry/src/se/hal/plugin/raspberry/RPiSensor.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiSensor.java
Executable file → Normal file
0
plugins/raspberry/src/se/hal/plugin/raspberry/RPiSensor.java → plugins/hal-raspberry/src/se/hal/plugin/raspberry/RPiSensor.java
Executable file → Normal file
0
plugins/raspberry/src/se/hal/plugin/raspberry/plugin.json → plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json
Executable file → Normal file
0
plugins/raspberry/src/se/hal/plugin/raspberry/plugin.json → plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json
Executable file → Normal file
0
plugins/tellstick/build.xml → plugins/hal-tellstick/build.xml
Executable file → Normal file
0
plugins/tellstick/build.xml → plugins/hal-tellstick/build.xml
Executable file → Normal file
0
plugins/tellstick/src/se/hal/plugin/tellstick/plugin.json → plugins/hal-tellstick/src/se/hal/plugin/tellstick/plugin.json
Executable file → Normal file
0
plugins/tellstick/src/se/hal/plugin/tellstick/plugin.json → plugins/hal-tellstick/src/se/hal/plugin/tellstick/plugin.json
Executable file → Normal file
BIN
plugins/hal-zwave/lib/zwave4j-0.3.jar
Normal file
BIN
plugins/hal-zwave/lib/zwave4j-0.3.jar
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue