merged control bridge changes
authorTonyCave <t-cave@ti.com>
Thu, 28 Nov 2013 11:30:05 +0000 (11:30 +0000)
committerTonyCave <t-cave@ti.com>
Thu, 28 Nov 2013 11:30:05 +0000 (11:30 +0000)
commitc26bd9dbde9d106444c08de8de655bedcdd4c6dc
treef4b3454e07bf5e8316fd9c26e52dd67c0b1954cc
parentf4aaf49f442b44c8dec3dc0271fa11ebd0d16889
merged control bridge changes
18 files changed:
client/AndroidClients/LightingController/bin/LightingController.apk [deleted file]
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/groupSelect$waitRspTask$1.class [deleted file]
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/groupSelect$waitRspTask.class [deleted file]
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/sceneSelect$waitRspTask$1.class [deleted file]
client/AndroidClients/LightingController/bin/classes/com/lightingcontroller/sceneSelect$waitRspTask.class [deleted file]
client/CClients/Source/socket_client.c.bak [deleted file]
client/CClients/lightFlashCmdLine/linux-gnu/makefile [moved from client/CClients/lightFlashCmdLine/i486-linux-gnu/makefile with 100% similarity, mode: 0644]
client/CClients/listDevsCmdLine/linux-gnu/makefile [moved from client/CClients/listDevsCmdLine/i486-linux-gnu/makefile with 100% similarity, mode: 0644]
client/CClients/openNetwork/linux-gnu/makefile [moved from client/CClients/openNetwork/i486-linux-gnu/makefile with 100% similarity, mode: 0644]
server/Source/SimpleDB.c
server/Source/SimpleDB.h
server/Source/SimpleDBTxt.c
server/Source/SimpleDBTxt.h
server/Source/zllSocCmd-TH.c [deleted file]
server/Source/zllSocCmd.c [deleted file]
server/Source/zllSocCmd.h [deleted file]
server/Source/zll_controller.c [deleted file]
server/linux-gnu/makefile [moved from server/i486-linux-gnu/Makefile with 100% similarity, mode: 0644]