Merge branch 'devel/tizen' into tizen 36/29736/1
authorBoram Park <boram1288.park@samsung.com>
Mon, 3 Nov 2014 12:06:44 +0000 (21:06 +0900)
committerBoram Park <boram1288.park@samsung.com>
Mon, 3 Nov 2014 12:06:44 +0000 (21:06 +0900)
Conflicts:
packaging/xf86-video-exynos.spec

Change-Id: I99bf23e0de8eb6f547dcbe8e9cf456dfecfadf56

1  2 
packaging/xf86-video-exynos.spec

@@@ -10,8 -10,8 +10,7 @@@ Source0:    %{name}-%{version}.tar.g
  
  BuildRequires:  pkgconfig(xorg-macros)
  BuildRequires:  pkgconfig(xorg-server)
- BuildRequires:  pkgconfig(x11)
  BuildRequires:  pkgconfig(xproto)
 -BuildRequires:  pkgconfig(dri3proto)
  BuildRequires:  pkgconfig(fontsproto)
  BuildRequires:  pkgconfig(randrproto)
  BuildRequires:  pkgconfig(renderproto)