projects / platform / framework / web / livebox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5680457 9ddf511)
Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:57:53 +0000 (12:57 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:57:53 +0000 (12:57 +0000)
Conflicts:
packaging/liblivebox.spec
src/livebox.c

Change-Id: Ia4cccebd50b8613537af419233052d04f91f98d7


Trivial merge
Domain: Web Framework / Uncategorized;