Merge commit 'origin/master'

[h-e-n] / Makefile

diff --git a/Makefile b/Makefile
index 5efdd88..8a2a275 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+FRED=42
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 26