aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2009-03-15 21:41:23 -0400
committerNicolas Pitre <nico@cam.org>2009-03-15 21:41:23 -0400
commitd6f818f71fa5db79969aaecba302745199376169 (patch)
treefcdedce488db0f80c7a816e0b52df83a01972838 /Makefile
parentace14b82633960a2b6bf6a0b2640c63872a65562 (diff)
parent305b07680f6c6a7e59f996c5bd85f009caff5bb1 (diff)
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 59cf6dacec0..d04ee0ad1dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 29
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc7
NAME = Erotic Pickled Herring
# *DOCUMENTATION*