Warning!

Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!

merge branches
authorMichael Prokop <mika@grml.org>
Sun Jan 21 01:44:14 2007 +0100 (22 months ago)
changeset 202ab18afc389a
manifest2ab18afc389a
parent 19e7ab3c80e9dd
parent 184f717977acb3
child 217a552dcb6a53
merge branches
--- a/2.6.19/5003_grml-kernelversion.patch Sun Jan 21 01:43:13 2007 +0100
+++ b/2.6.19/5003_grml-kernelversion.patch Sun Jan 21 01:44:14 2007 +0100
@@ -1,5 +1,5 @@
---- Makefile.orig 2007-01-18 23:14:28.000000000 +0100
-+++ Makefile 2007-01-18 23:23:45.000000000 +0100
+--- a/Makefile 2007-01-18 23:14:28.000000000 +0100
++++ b/Makefile 2007-01-18 23:23:45.000000000 +0100
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6