summaryrefslogtreecommitdiff
path: root/ext/ereg/ereg.c
diff options
context:
space:
mode:
authorPierre Joye <pierre.php@gmail.com>2013-04-10 20:13:18 +0200
committerPierre Joye <pierre.php@gmail.com>2013-04-10 20:13:18 +0200
commitc480bf3fb2f04952f4421df197c58b07b479c1c1 (patch)
tree089079aad9fdc34ac2bfbb6f7c0f21ce5470a3cc /ext/ereg/ereg.c
parent442ff25187081212631c03a49041a0529520b505 (diff)
parent224a67fb9f91f027efa8142d6b81072b33bd6cc5 (diff)
downloadphp-git-c480bf3fb2f04952f4421df197c58b07b479c1c1.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: add external 2.1 detection and fix gd_compat for 2.1+
Diffstat (limited to 'ext/ereg/ereg.c')
0 files changed, 0 insertions, 0 deletions