diff --git a/[refs] b/[refs] index 71699c6ec920..242b0848b027 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23cb3ada1b011f708ff881b66b2cfb6c11068fa5 +refs/heads/master: df7addbb45874f0f992266003155de5a22e1872f diff --git a/trunk/Makefile b/trunk/Makefile index ad457e1bd0d2..f4218b5db827 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 15 -EXTRAVERSION =-rc5 -NAME=Affluent Albatross +EXTRAVERSION =-rc6 +NAME=Sliding Snow Leopard # *DOCUMENTATION* # To see a list of typical targets execute "make help"