diff options
| author | David Soria Parra <dsp@php.net> | 2012-04-13 14:33:25 (GMT) |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-04-13 14:33:25 (GMT) |
| commit | de6dfe5bbd197e6387f0044b857b518e29e27283 (patch) | |
| tree | 527a2b6b692ed12292ce0c1a7bc8d03ed38265ac | |
| parent | 676f0deb38910bcc859924f871c284b73a9dd13d (diff) | |
| parent | e9b978c374e0b8f2afd32ff07920f419fce4b9fb (diff) | |
| download | php-PHP-5.4.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4PHP-5.4
* PHP-5.3:
configure.in: Check for README.GIT-RULES instead of README.SVN-RULES
Conflicts:
configure.in
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 49a88b1..76f3598 100644 --- a/configure.in +++ b/configure.in @@ -9,7 +9,7 @@ dnl Basic autoconf + automake initialization, generation of config.nice. dnl ------------------------------------------------------------------------- AC_PREREQ(2.59) -AC_INIT(README.SVN-RULES) +AC_INIT(README.GIT-RULES) ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], []) PHP_CONFIG_NICE(config.nice) |