projects / platform / core / uifw / libdmx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d591ee 2cc5335)
Merge branch 'upstream' into tizen
authorChangyeon Lee <cyeon.lee@samsung.com>
Wed, 9 Apr 2014 05:58:20 +0000 (14:58 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Wed, 9 Apr 2014 05:58:20 +0000 (14:58 +0900)
Conflicts:
configure.ac
src/dmx.c


Trivial merge
Domain: Graphics System / X Window System;