Merge from master
authorKi-wook <kiwook.hong@samsung.com>
Tue, 19 Mar 2013 07:12:11 +0000 (16:12 +0900)
committerKi-wook <kiwook.hong@samsung.com>
Tue, 19 Mar 2013 07:12:11 +0000 (16:12 +0900)
commit39f61fde8ad5093e58a3f1af5716bc1831b318b7
treea2f36e36e53e491e44930300cf42fd31258732db
parentd91fb1d97e1699c58eb23cf11749ae49961139b5
Merge from master

Change-Id: I412e547a5ea62feab8e2b0988cf6d83615b49bef
Signed-off-by: Ki-wook <kiwook.hong@samsung.com>
project/inc/RuntimePanel.h
project/inc/SettingPanel.h
project/src/DevicePanel.cpp
project/src/RuntimePanel.cpp
project/src/SettingPanel.cpp