Revert "Separate watch-application.h into wearable.h" 69/83169/1
authortaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 08:29:19 +0000 (17:29 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Tue, 9 Aug 2016 08:29:32 +0000 (17:29 +0900)
commitf683251a7877f2aeec214e507b1bb8382bcc97b4
tree322e8d255ef4fabce8f91b286855a46c266864e3
parentebaf082553eb04597a4d2121c89e122e1ac566bb
Revert "Separate watch-application.h into wearable.h"

This reverts commit 6d1c86d6279f63d8a662a37022060401e4b86cc9.

Change-Id: Ic94b092379c91840de22c5f03ef68cc354a1102f
adaptors/public-api/dali.h
adaptors/wearable/dali-wearable.h [deleted file]
adaptors/wearable/file.list [deleted file]
automated-tests/src/dali-adaptor/CMakeLists.txt
build/tizen/adaptor/Makefile.am