ecp: merge ecp branch into develop

evdi, nfc and sensor devices added
Signed-off-by: DaiYoung, Kim <daiyoung777.kim@samsung.com>

diff --git a/package/changelog b/package/changelog
index b2b2078166a57edd588919ed17a5761f0951f992..d6bb723b266a2793f339c5a1e0e10a3b6a635372 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,9 @@
+* 1.5.71
+- merge ecp branch into develop
+- evdi, nfc and sensor device added
+- control server added
+- protocol buffer applied
+== DaiYoung Kim <daiyoung777.kim@samsung.com> 2013-07-26
 * 1.5.70
 - modified structure of virtio-hwkey
 == Sungmin Ha <sungmin82.ha@samsung.com> 2013-07-25

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index e9f12aa842707374dbcb07e9dde8d5176507b453..f4630f0097e259e33d8a8a0a1fe7538eefff7b17 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.5.70
+Version: 1.5.71
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator