diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-11-12 21:00:57 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-11-12 21:00:57 +0000 |
| commit | ca7b77dffb303b78de716a6ccb1b3f8eb1a2f7c3 (patch) | |
| tree | 2e457d4c0a2b4f36f107ddc8df700ebd7df4d50e /libc | |
| parent | 381fe24319c83adc10220000c091b57bd63da32e (diff) | |
| download | eglibc2-ca7b77dffb303b78de716a6ccb1b3f8eb1a2f7c3.tar.gz | |
Merge changes between r9222 and r9240 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@9241 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/ChangeLog | 4 | ||||
| -rw-r--r-- | libc/version.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libc/ChangeLog b/libc/ChangeLog index 49c2e08a4..743121f7a 100644 --- a/libc/ChangeLog +++ b/libc/ChangeLog @@ -1,3 +1,7 @@ +2009-11-12 Ulrich Drepper <drepper@redhat.com> + + * version.h: Bump for 2.12 development. + 2009-11-10 Andreas Schwab <schwab@redhat.com> * resolv/mapv4v6hostent.h (map_v4v6_hostent): Return non-zero if diff --git a/libc/version.h b/libc/version.h index e44ecd4a1..db60a0c44 100644 --- a/libc/version.h +++ b/libc/version.h @@ -1,4 +1,4 @@ /* This file just defines the current version number of libc. */ -#define RELEASE "stable" -#define VERSION "2.11" +#define RELEASE "development" +#define VERSION "2.11.90" |