projects / platform / core / system / system-server.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8fb79a 8c54d99)
Merge branch 'tizen_2.2' into tizen tizen_3.0 submit/tizen/20130904.062602
authorjy910.yun <jy910.yun@samsung.com>
Tue, 3 Sep 2013 12:11:11 +0000 (21:11 +0900)
committerjy910.yun <jy910.yun@samsung.com>
Tue, 3 Sep 2013 12:11:11 +0000 (21:11 +0900)
commit9612df5004c5c3090cf73f5f9730e1b6a24670e9
tree3a6f9c66237ff65e96ca1ba6b3f906e05d77139btree | snapshot
parente8fb79af57be2cdf334d713e0f9324e71c9287e8commit | diff
parent8c54d99994679a31560ca58013c8d06b28b0d595commit | diff
Merge branch 'tizen_2.2' into tizen

Conflicts:
packaging/system-server.manifest
packaging/system-server.spec
ss_predefine.c

Signed-off-by: jy910.yun <jy910.yun@samsung.com>
CMakeLists.txt diff1 | diff2 | blob | history
packaging/system-server.spec diff1 | diff2 | blob | history
Domain: System / Uncategorized;