diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:58:42 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 19:58:42 -0500 |
commit | 000b238bca0bb6f4bb053fd69f7f02cebdace5cf (patch) | |
tree | 7698904204eccf3df4f25f61cdfb8657b362e09f | |
parent | b962697b79a147aeaca6864f2d6c424bd462b446 (diff) | |
parent | 535744878e34d01a53f946f26dfbca37186f2cf8 (diff) |
Merge branch 'master'
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 16 | 3 | SUBLEVEL = 16 |
4 | EXTRAVERSION =-rc5 | 4 | EXTRAVERSION =-rc6 |
5 | NAME=Sliding Snow Leopard | 5 | NAME=Sliding Snow Leopard |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |