Merge with master branch
authorLi Zhang <li2012.zhang@samsung.com>
Mon, 1 Apr 2013 11:03:23 +0000 (19:03 +0800)
committerLi Zhang <li2012.zhang@samsung.com>
Mon, 1 Apr 2013 11:03:23 +0000 (19:03 +0800)
commit2976d494c679f41d8385199cf26f23cecf60ec82
tree07853d38e10ff17f53cd00b22f29f222e546dd0e
parent4f75ffa724f70213cbc7991f9661be79dad4c411
Merge with master branch

Change-Id: I5062c0db20ba06483c5212b7737ffd4c24ec223e
packaging/ise-engine-tables.spec
src/scim_table_imengine.cpp