]> granicus.if.org Git - php/commit
Merge branch 'datefmt_tz_cal_interop'
authorGustavo André dos Santos Lopes <cataphract@php.net>
Sun, 22 Jul 2012 02:22:48 +0000 (04:22 +0200)
committerGustavo André dos Santos Lopes <cataphract@php.net>
Sun, 22 Jul 2012 02:22:48 +0000 (04:22 +0200)
commit99e48d3a5751b486fdc49a3409edd509faa3b27c
tree911f0481885ad0039d09b9d69fd5c6138776ae13
parent11a5afec22e62af1555ceedc41460b96f8c06ed5
parent2498c90c71980168b5b9ac2fa006340b9460b1f2
Merge branch 'datefmt_tz_cal_interop'

* datefmt_tz_cal_interop:
  Readded accidentally removed line
  Added IntlDateFormatter::formatObject(). Refactor
  Refactored internal_get_timestamp()
  Unified zval -> UDate conversions
ext/intl/calendar/calendar_methods.cpp
ext/intl/config.m4
ext/intl/config.w32
ext/intl/dateformat/dateformat_class.c
ext/intl/php_intl.c
ext/intl/timezone/timezone_methods.cpp