aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-11 19:58:42 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-11 19:58:42 -0500
commit000b238bca0bb6f4bb053fd69f7f02cebdace5cf (patch)
tree7698904204eccf3df4f25f61cdfb8657b362e09f
parentb962697b79a147aeaca6864f2d6c424bd462b446 (diff)
parent535744878e34d01a53f946f26dfbca37186f2cf8 (diff)
downloadlinux-000b238bca0bb6f4bb053fd69f7f02cebdace5cf.tar.gz
Merge branch 'master'
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 65a0337bebe0cb..ac54c03c1b1a9c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 16
-EXTRAVERSION =-rc5
+EXTRAVERSION =-rc6
NAME=Sliding Snow Leopard
# *DOCUMENTATION*