diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-03-10 12:10:57 +0100 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-03-10 12:10:57 +0100 |
| commit | d2e42d53729d065537d7576a2fd2975ff94e6ae6 (patch) | |
| tree | 4f4f0a771e5e2f060f48746e27bb464c677fbc17 /ext/sqlite3/libsqlite/sqlite3ext.h | |
| parent | 1fdca8208f057ba48fc7efdae0056f7978120688 (diff) | |
| parent | 28fa31d6e5000b1550d8d2b471fc0c2425165180 (diff) | |
| download | php-git-d2e42d53729d065537d7576a2fd2975ff94e6ae6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix #66872, invalid argument crashes gmp_testbit
fix #66872, invalid argument crashes gmp_testbit
add vc12 (2013)
Conflicts:
win32/build/confutils.js
Diffstat (limited to 'ext/sqlite3/libsqlite/sqlite3ext.h')
0 files changed, 0 insertions, 0 deletions