Merge branch 'devel/tizen' into tizen 89/32789/1 submit/tizen_common/20141224.043059 submit/tizen_mobile/20141224.043104 submit/tizen_tv/20141224.043109
authorSooChan Lim <sc1.lim@samsung.com>
Wed, 24 Dec 2014 04:15:24 +0000 (13:15 +0900)
committerSooChan Lim <sc1.lim@samsung.com>
Wed, 24 Dec 2014 04:15:24 +0000 (13:15 +0900)
commit7394f60c9313e86c7057b1a0e058e89f75db30c9
tree476494455653a915159d87238b39b09afa16e2a5
parent5e74aa79913256b233eacf3c5ff44b3d1fd737cc
parentcb29e75073aa50d064883f4ab2d5c9f311e3f5d2
Merge branch 'devel/tizen' into tizen

Conflicts:
packaging/xf86-video-exynos.spec

Change-Id: Ie149d31906c7e1cb920750afdf3874130a195c22
packaging/xf86-video-exynos.spec