diff --git a/[refs] b/[refs] index 5efc3f33ac40..2a320baf95eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c1a7747059a65dbc2d7703978841a37db699fbf +refs/heads/master: fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc diff --git a/trunk/Makefile b/trunk/Makefile index df6ce3e80090..d04ee0ad1dcc 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 29 -EXTRAVERSION = -rc6 +EXTRAVERSION = -rc7 NAME = Erotic Pickled Herring # *DOCUMENTATION*