projects / platform / upstream / xmodmap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba48cdc 60f28bd)
Merge branch 'devel/upgrade' into tizen 12/19712/1 accepted/tizen_3.0.2014.q3_common accepted/tizen_common accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable devel/x11 tizen tizen_3.0.2014.q3_common tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common accepted/tizen/mobile/20140519.083546 submit/devel/x11/20140718.035926 submit/tizen/20140417.073530 submit/tizen/20140818.084211 submit/tizen/20140818.144456 submit/tizen/20140819.234625 submit/tizen_mobile/20141120.000000 tizen_3.0.2014.q3_common_release
authorChangyeon Lee <cyeon.lee@samsung.com>
Thu, 17 Apr 2014 05:39:55 +0000 (14:39 +0900)
committerChangyeon Lee <cyeon.lee@samsung.com>
Thu, 17 Apr 2014 05:46:32 +0000 (14:46 +0900)
Change-Id: I749535b16275d88f9bf0bd620486c97e4eb694dd
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>

Trivial merge
Domain: Graphics System / X Window System;