projects / sdk / tools / cli.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d51ef8 ef78591)
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)
Conflicts:
package/build.linux
package/pkginfo.manifest

Change-Id: Ic68eb82dc05678fdfee3c3b544256bbdbf5e7bbf
Signed-off-by: hyunsik.noh <hyunsik.noh@samsung.com>
1  2 
package/build.linux patch | diff1 | diff2 | blob | history
package/pkginfo.manifest patch | diff1 | diff2 | blob | history

diff --cc package/build.linux
Simple merge
diff --cc package/pkginfo.manifest
Simple merge
Domain: SDK / Command line tools;