| #
e1180b4f |
| 11-Aug-2012 |
Xinchen Hui |
Fixed bug #62795 (Zip extension version not defined) |
|
Revision tags: php-5.4.6RC1, php-5.4.5, php-5.3.15, php-5.3.15RC1, php-5.4.5RC1, php-5.3.14, php-5.4.4, php-5.3.14RC2, php-5.4.4RC2, php-5.3.14RC1, php-5.4.4RC1, php-5.3.13, php-5.4.3, php-5.4.2, php-5.3.12, php-5.3.11, php-5.4.1, php-5.3.11RC2, php-5.4.1RC2 |
|
| #
112a476b |
| 10-Apr-2012 |
Gustavo André dos Santos Lopes |
Merge .gitattributes EOL commit from 5.3.
This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the sv
Merge .gitattributes EOL commit from 5.3.
This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the svn:eol-style attributes differing between the two
branches.
show more ...
|
| #
1c8fccdf |
| 10-Apr-2012 |
Gustavo André dos Santos Lopes |
Disabled EOL conversions on certain tests |
|
Revision tags: php-5.3.11RC1, php-5.4.1RC1, PHP-5.4.1-RC1 |
|
| #
ca797ca3 |
| 21-Mar-2012 |
David Soria Parra |
Use the NEWS merge driver if available
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to
Use the NEWS merge driver if available
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it
is possible to setup a custom merge driver for NEWS so git doesnt try
to merge it. This commit sets the default merge driver for the NEWS
file to the merge driver called NEWS.
show more ...
|
| #
944e6228 |
| 21-Mar-2012 |
David Soria Parra |
Always keep the NEWS file from the branch when merging
We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use
Always keep the NEWS file from the branch when merging
We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use the 'ours' strategy
for the NEWS file.
show more ...
|
| #
eb8812e5 |
| 20-Mar-2012 |
David Soria Parra |
Enable $Id$ expansion for files with the $Revision$ keyword
Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion onl
Enable $Id$ expansion for files with the $Revision$ keyword
Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.
show more ...
|
