]> granicus.if.org Git - php/commit
Merge branch 'master' of https://github.com/php/php-src
authorDaniel Lowrey <rdlowrey@php.net>
Tue, 28 Jan 2014 16:53:17 +0000 (09:53 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Tue, 28 Jan 2014 16:53:17 +0000 (09:53 -0700)
commit4bc8f94b58cacafae502ea9a37fc1594f5334d7c
treeb8296c9cf245745ad980f4ce8e7219319f6381ab
parent4b8c098f022f99ef8812eef4758d74fa52ee194b
parentfb5c7cda5d776a84730c5133f27e72cb427f22ae
Merge branch 'master' of https://github.com/php/php-src

* 'master' of https://github.com/php/php-src:
  add text for the new constants
  add new consts