diff options
| author | Anatol Belski <ab@php.net> | 2014-02-06 09:17:29 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-02-06 09:17:29 +0100 |
| commit | 8605702a7a7e0afe7ab9ae49404f3cabcb86fa08 (patch) | |
| tree | 262fe067b01fb63894cccd63d098ec64253dc6a3 | |
| parent | 6267c40ac501861b596a3fd203b20eba00778919 (diff) | |
| parent | e41059c63313178f14b085c150cfc70896ba91df (diff) | |
| download | php-git-8605702a7a7e0afe7ab9ae49404f3cabcb86fa08.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update libs_version.txt
Conflicts:
win32/build/libs_version.txt
0 files changed, 0 insertions, 0 deletions