summaryrefslogtreecommitdiff
path: root/ext/intl/breakiterator/breakiterator_iterators.cpp
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2012-06-03 18:20:26 -0300
committerFelipe Pena <felipensp@gmail.com>2012-06-03 18:20:26 -0300
commit60c5f9910fbc5bd21fca8a624c6486ad8a41273a (patch)
tree70838043ee12a4002b50cf5b2ba7c39a73beb411 /ext/intl/breakiterator/breakiterator_iterators.cpp
parent1fa8ecd082607858084994ad7081ef06e37db5f5 (diff)
parentd57b278ad1f490094b0c3331cf02312b785a8a78 (diff)
downloadphp-git-60c5f9910fbc5bd21fca8a624c6486ad8a41273a.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: - Optimize comparison between same HashTable pointer - Fixed bug #62205 (php-fpm segfaults (null passed to strstr)) - fix missing include for unix sockets - Comment unused function to avoid warnings
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_iterators.cpp')
0 files changed, 0 insertions, 0 deletions