]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_54' into PHP-5.4
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 15 Jan 2013 20:05:21 +0000 (21:05 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 15 Jan 2013 20:05:21 +0000 (21:05 +0100)
* remotes/cataphract/strtr_wu94_54:
  Fixed inconsequential bug in strtr()
  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


Trivial merge