projects / platform / upstream / iotivity.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7960d89 b6269c9)
Update and resolve conflict of service SConscript
authorhunje.yeon <hunje.yeon@samsung.com>
Sun, 19 Jul 2015 09:23:37 +0000 (18:23 +0900)
committerhunje.yeon <hunje.yeon@samsung.com>
Sun, 19 Jul 2015 09:23:37 +0000 (18:23 +0900)
commit7fbee66fa26ef5322bde5734f9362accf7671354
tree0f9c8b7e4ed8d41b68dfb4dc9100105111b2eb77tree | snapshot
parent7960d897657ac0101d0b94a32952ad0d4f160875commit | diff
parentb6269c94723fe13ce2bda36ee42e6309660ca7abcommit | diff
Update and resolve conflict of service SConscript

Change-Id: Iade5cafaf1c20dfc2c204fc53c80cb13a4241e27
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>
Domain: Network & Connectivity / IoT Connectivity;