granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

author	David Soria Parra <dsp@php.net>
	Tue, 20 Mar 2012 16:58:58 +0000 (17:58 +0100)
committer	David Soria Parra <dsp@php.net>
	Tue, 20 Mar 2012 16:58:58 +0000 (17:58 +0100)
commit	c918ca57a7233206ec78ac00438eeb6830e3680b
tree	6a0b5e4ea85c7a53a15231cfc7291837d9ea9c09	tree \| snapshot
parent	71d894cd421d96517618e9d33dfea640499c8ffd	commit \| diff
parent	f7b10abae939412e8b5cab69cd579e071deb446b	commit \| diff

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
ext/mysqlnd/mysqlnd.h

13 files changed:

README.input_filter	diff1 \|	diff2 \|	blob \| history
ext/dba/libflatfile/flatfile.c	diff1 \|	diff2 \|	blob \| history
ext/dba/libinifile/inifile.c	diff1 \|	diff2 \|	blob \| history
ext/enchant/enchant.c	diff1 \|	diff2 \|	blob \| history
ext/filter/filter.c	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd.h	diff1 \|	diff2 \|	blob \| history
ext/phar/phar.c	diff1 \|	diff2 \|	blob \| history
ext/posix/posix.c	diff1 \|	diff2 \|	blob \| history
ext/reflection/php_reflection.c	diff1 \|	diff2 \|	blob \| history
ext/simplexml/simplexml.c	diff1 \|	diff2 \|	blob \| history
ext/sysvmsg/sysvmsg.c	diff1 \|	diff2 \|	blob \| history
sapi/continuity/capi.c	diff1 \|	diff2 \|	blob \| history
sapi/nsapi/nsapi.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

README.input_filter	diff1 \|	diff2 \|	blob \| history
ext/dba/libflatfile/flatfile.c	diff1 \|	diff2 \|	blob \| history
ext/dba/libinifile/inifile.c	diff1 \|	diff2 \|	blob \| history
ext/enchant/enchant.c	diff1 \|	diff2 \|	blob \| history
ext/filter/filter.c	diff1 \|	diff2 \|	blob \| history
ext/mysqlnd/mysqlnd.h	diff1 \|	diff2 \|	blob \| history
ext/phar/phar.c	diff1 \|	diff2 \|	blob \| history
ext/posix/posix.c	diff1 \|	diff2 \|	blob \| history
ext/reflection/php_reflection.c	diff1 \|	diff2 \|	blob \| history
ext/simplexml/simplexml.c	diff1 \|	diff2 \|	blob \| history
ext/sysvmsg/sysvmsg.c	diff1 \|	diff2 \|	blob \| history
sapi/continuity/capi.c	diff1 \|	diff2 \|	blob \| history
sapi/nsapi/nsapi.c	diff1 \|	diff2 \|	blob \| history