projects / external / libiri.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25b11e0 bf5efa1)
[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)
Merge branch 'master' into tizen_2.2

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

Change-Id: I03a25f1b0a9482327c5cf532bd54f87d1c58385c


Trivial merge
Domain: Network & Connectivity / Uncategorized;