]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9307126 1da67fc)
Merge branch 'PHP-5.5'
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 29 Jan 2013 18:12:14 +0000 (19:12 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 29 Jan 2013 18:12:14 +0000 (19:12 +0100)
commitae0c9d547d7e1e69f4413eee50c7057c031cd1cf
tree486528bfbcccc10ddd70f5f21ebe8e4950cf4381tree | snapshot
parent9307126fe50238e78a3f0ae4ba5f3ff04f2be99acommit | diff
parent1da67fc65e4909c671a9ccffec7d8d314f1829f1commit | diff
Merge branch 'PHP-5.5'

* PHP-5.5:
  intl/converter in line w/ intl error handling
  Fix zpp() call in intl/converter
  Write local err on intlcal_get_time_zone() failure
  Improve ERROR.CONVENTIONS
  Fix arginfo of BreakIterator::getLocale
  intl: doc explaining error conventions
  Add UConverter class (ICU's UConverter API)
Unnamed repository; edit this file 'description' to name the repository.