diff options
| author | Vlad Glagolev | 2015-02-11 18:10:31 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2015-02-11 18:10:31 +0300 |
| commit | 01317669fe327e50ba03ff3ce15352ffa6e37479 (patch) | |
| tree | ae65a02bc7041c237db195167108420d4cbd224c /wm-addons | |
| parent | e3c378e5017903b95b8ffff964b691861d467837 (diff) | |
| parent | 6bb0aa644327af60df0779dcd06cb7782d7559ca (diff) | |
Merge branch 'master' into devel-xorg-modular
Conflicts:
libs/sdl2/HISTORY
xorg-driver/xf86-video-intel/DEPENDS
xorg-driver/xf86-video-intel/HISTORY
xorg-xserver/xorg-server/DEPENDS
xorg-xserver/xorg-server/HISTORY
Diffstat (limited to 'wm-addons')
| -rwxr-xr-x | wm-addons/razor-qt/DEPENDS | 2 | ||||
| -rw-r--r-- | wm-addons/razor-qt/HISTORY | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/wm-addons/razor-qt/DEPENDS b/wm-addons/razor-qt/DEPENDS index d06990ce4f..3cf5d90249 100755 --- a/wm-addons/razor-qt/DEPENDS +++ b/wm-addons/razor-qt/DEPENDS @@ -1,5 +1,5 @@ depends qt4 && -depends UDEV && +depends DEVICE-MANAGER && depends file && depends cmake && optional_depends doxygen '' '' 'to build developer documentation' && diff --git a/wm-addons/razor-qt/HISTORY b/wm-addons/razor-qt/HISTORY index c04a729932..6174d99a9a 100644 --- a/wm-addons/razor-qt/HISTORY +++ b/wm-addons/razor-qt/HISTORY @@ -1,4 +1,7 @@ -2013-07-28 Treeve Jelbert <treeve@sourcemage.org> +2015-02-11 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS: UDEV -> DEVICE-MANAGER + +2013-07-28 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: udev => UDEV 2012-10-25 Ladislav Hagara <hgr@vabo.cz> |