summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-02-16 12:34:17 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-02-16 12:34:17 +0100
commita7f8693df11bd5b0e2070ba9920967eb4c4f39da (patch)
tree02edf6d85b57df8ad522a8ac5142f047b01917e4
parentb7175b8627c561964959f8ef914829af9efb64e1 (diff)
downloaddrakx-a7f8693df11bd5b0e2070ba9920967eb4c4f39da.tar
drakx-a7f8693df11bd5b0e2070ba9920967eb4c4f39da.tar.gz
drakx-a7f8693df11bd5b0e2070ba9920967eb4c4f39da.tar.bz2
drakx-a7f8693df11bd5b0e2070ba9920967eb4c4f39da.tar.xz
drakx-a7f8693df11bd5b0e2070ba9920967eb4c4f39da.zip
2.6
-rw-r--r--images/Makefile2
-rw-r--r--images/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/images/Makefile b/images/Makefile
index aff38b6e3..9c9230214 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=2.5
+VERSION=2.6
PRODUCT=drakx-installer-images
KERNELS=$(shell rpm -qf /lib/modules/3.*)
diff --git a/images/NEWS b/images/NEWS
index c40f5b50d..ab3f46e53 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+Version 2.6 - 16 February 2014 by Thierry Vignaud
+
- sync with kernel-3.12
Version 2.5 - 24 January 2014 by Colin Guthrie