[Release] libiri_1.6 tizen_2.2 2.2.1_release submit/tizen_2.2/20131107.060728
authorsung-su.kim <sung-su.kim@samsung.com>
Thu, 17 Oct 2013 02:09:23 +0000 (11:09 +0900)
committersung-su.kim <sung-su.kim@samsung.com>
Thu, 17 Oct 2013 02:09:23 +0000 (11:09 +0900)
commitb46e4351012d8a25752cf6504cd6d6fae89d758b
tree8945327085b4a5da5b192746cdc437c9299aac0d
parent25b11e02e66ca2668892372ba2777e879eec5ee0
parentbf5efa1d9367d23b7ffb926df9d6fe7e3f0ab9c8
[Release] libiri_1.6

Merge branch 'master' into tizen_2.2

Conflicts:
libiri.pc.in
packaging/libiri.spec

Change-Id: I03a25f1b0a9482327c5cf532bd54f87d1c58385c