Merge branch 'master' into 2.1
authorJisung Ahn <jcastle.ahn@samsung.com>
Sat, 30 Mar 2013 02:34:46 +0000 (11:34 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Sat, 30 Mar 2013 02:34:46 +0000 (11:34 +0900)
commit2c620fc41e9ee632d36e0676492537b54aec0236
tree71f4d25c8b1954313c0b236ff4bd056a9369e864
parenta52ae4bab72cd66704d1e5bd8ad74d07ef27beb3
parentf0f89e0301453a9e37dee5ffc63f0420f428979b
Merge branch 'master' into 2.1

Conflicts:
feature/include/ivug-ext-ug.h
feature/src/ivug-ext-ug.c
main/src/view/ivug-main-view-menu.cpp

Change-Id: I0faa95a402b5f6471172bf630f0e2528059ac205