]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 15 Jan 2013 20:45:22 +0000 (21:45 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 15 Jan 2013 20:45:22 +0000 (21:45 +0100)
commit1bd193ed36d413f0d919856f65feb35a0b1580f3
tree2718e88b62cf591e436885ff1bd92ceccf0a330c
parent5cfa916aad14df889e9119161e359b57a4d9886e
parent88b82ae54d9e82eb114a0f48b3e910f04edc5f34
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5

* remotes/cataphract/strtr_wu94_55:
  Fixed inconsequential bug in strtr()
  UPGRADING.INTERNALS: document zend_qsort_r
  Add zend_qsort_r & use it in strtr
  NEWS for bug #63893
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array