CLI: Merge branch 'ncli' into tizen 33/14533/1
authorhyunsik.noh <hyunsik.noh@samsung.com>
Tue, 7 Jan 2014 06:40:07 +0000 (15:40 +0900)
committerhyunsik.noh <hyunsik.noh@samsung.com>
Tue, 7 Jan 2014 06:40:07 +0000 (15:40 +0900)
commit4d4ac23b5fd74bc2e571534188b6d149bd3d23b1
treefd9d76912db9697ce9ddf3951685036fdd1ff9ef
parent6d51ef85647f48ccbbc2de695d72a1f26568d1c9
parentef78591e996b6e86d2a0454bedcc3abe22858179
CLI: Merge branch 'ncli' into tizen

Conflicts:
package/build.linux
package/pkginfo.manifest

Change-Id: Ic68eb82dc05678fdfee3c3b544256bbdbf5e7bbf
Signed-off-by: hyunsik.noh <hyunsik.noh@samsung.com>
package/build.linux
package/pkginfo.manifest