diff options
| author | Vlad Glagolev | 2014-10-31 16:40:24 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2014-10-31 16:40:24 +0300 |
| commit | e0773e6c919c867a712e2b240aec0421c4ae00cd (patch) | |
| tree | 20ab64a58d65779e2dad0afb62815618cae23596 /wm-addons | |
| parent | b1b59fc8ede4321375dad19cef416acb27589255 (diff) | |
| parent | 8454e9838c07bc151aa80cbd14c2defaf16fd04d (diff) | |
Merge branch 'master' into devel-xorg-modular
Conflicts:
http/webkitgtk/HISTORY
libs/openscenegraph/HISTORY
Diffstat (limited to 'wm-addons')
| -rwxr-xr-x | wm-addons/cairo-dock-plugins/DETAILS | 3 | ||||
| -rw-r--r-- | wm-addons/cairo-dock-plugins/HISTORY | 3 | ||||
| -rwxr-xr-x | wm-addons/cairo-dock/DETAILS | 2 | ||||
| -rw-r--r-- | wm-addons/cairo-dock/HISTORY | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/wm-addons/cairo-dock-plugins/DETAILS b/wm-addons/cairo-dock-plugins/DETAILS index 732b5a3e8b..db79292ebf 100755 --- a/wm-addons/cairo-dock-plugins/DETAILS +++ b/wm-addons/cairo-dock-plugins/DETAILS @@ -1,5 +1,5 @@ SPELL=cairo-dock-plugins - VERSION=3.3.2 + VERSION=3.4.0 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=http://launchpad.net/cairo-dock-plug-ins/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE SOURCE2=$SOURCE.asc @@ -14,4 +14,3 @@ SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" cat << EOF Many exciting plug-ins for Cairo Dock EOF - diff --git a/wm-addons/cairo-dock-plugins/HISTORY b/wm-addons/cairo-dock-plugins/HISTORY index 96d13c489f..72d422eb92 100644 --- a/wm-addons/cairo-dock-plugins/HISTORY +++ b/wm-addons/cairo-dock-plugins/HISTORY @@ -1,3 +1,6 @@ +2014-10-24 Pol Vinogradov <vin.public@gmail.com> + * DETAILS: version 3.4.0 + 2014-07-03 Pol Vinogradov <vin.public@gmail.com> * DETAILS: version 3.3.2 diff --git a/wm-addons/cairo-dock/DETAILS b/wm-addons/cairo-dock/DETAILS index e77965fe7c..4a9ad48c96 100755 --- a/wm-addons/cairo-dock/DETAILS +++ b/wm-addons/cairo-dock/DETAILS @@ -1,5 +1,5 @@ SPELL=cairo-dock - VERSION=3.3.2 + VERSION=3.4.0 SOURCE="${SPELL}-${VERSION}.tar.gz" SOURCE_URL[0]=http://launchpad.net/cairo-dock-core/${VERSION:0:3}/${VERSION:0:5}/+download/$SOURCE SOURCE2=$SOURCE.asc diff --git a/wm-addons/cairo-dock/HISTORY b/wm-addons/cairo-dock/HISTORY index 1a879b2c1c..74967e95da 100644 --- a/wm-addons/cairo-dock/HISTORY +++ b/wm-addons/cairo-dock/HISTORY @@ -1,3 +1,6 @@ +2014-10-24 Pol Vinogradov <vin.public@gmail.com> + * DETAILS: version 3.4.0 + 2014-07-03 Pol Vinogradov <vin.public@gmail.com> * DETAILS: version 3.3.2 |