diff options
| author | Treeve Jelbert | 2014-09-25 18:49:15 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2014-09-25 18:49:15 +0200 |
| commit | 270abc29b86e857e7d92d0926a67cc7b97c45acc (patch) | |
| tree | 91762554b013870a249bcce9467cb921fcdfc12a /wm-addons | |
| parent | bfb78bf3026408e88059939906f1231751703cf7 (diff) | |
| parent | accc9b812a427d80050c63a3a299089cd444a1c4 (diff) | |
Merge remote-tracking branch 'origin/master' into devel-xorg-modular
Conflicts:
xorg-driver/xf86-video-ati/DEPENDS
xorg-driver/xf86-video-ati/HISTORY
xorg-lib/libxaw/HISTORY
xorg-lib/libxcb/DEPENDS
xorg-lib/libxcb/HISTORY
xorg-lib/libxcomposite/HISTORY
xorg-lib/libxcursor/HISTORY
xorg-lib/libxdamage/HISTORY
xorg-lib/libxext/HISTORY
xorg-lib/libxfixes/HISTORY
xorg-lib/libxft/HISTORY
xorg-lib/libxi/HISTORY
xorg-lib/libxinerama/HISTORY
xorg-lib/libxkbfile/HISTORY
xorg-lib/libxmu/HISTORY
xorg-lib/libxpm/HISTORY
xorg-lib/libxrandr/HISTORY
xorg-lib/libxrender/HISTORY
xorg-lib/libxres/HISTORY
xorg-lib/libxtst/HISTORY
xorg-lib/libxv/HISTORY
xorg-lib/libxvmc/HISTORY
xorg-lib/libxxf86dga/HISTORY
xorg-lib/libxxf86vm/HISTORY
xorg-proto/kbproto/DEPENDS
xorg-xserver/xorg-server/DEPENDS
Diffstat (limited to 'wm-addons')
| -rwxr-xr-x | wm-addons/slock/DEPENDS | 2 | ||||
| -rw-r--r-- | wm-addons/slock/HISTORY | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/wm-addons/slock/DEPENDS b/wm-addons/slock/DEPENDS new file mode 100755 index 0000000000..7295b07d61 --- /dev/null +++ b/wm-addons/slock/DEPENDS @@ -0,0 +1,2 @@ +depends libx11 && +depends libxext diff --git a/wm-addons/slock/HISTORY b/wm-addons/slock/HISTORY index 2f73fceee2..340ae4f4ff 100644 --- a/wm-addons/slock/HISTORY +++ b/wm-addons/slock/HISTORY @@ -1,3 +1,6 @@ +2014-09-25 Remko van der Vossen <wich@sourcemage.org> + * DEPENDS: libx11, libxext + 2009-08-24 Donald Johnson <ltdonny@gmail.com> * DETAILS: Updated source |