]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDavid Soria Parra <dsp@php.net>
Fri, 26 Apr 2013 10:41:08 +0000 (12:41 +0200)
committerDavid Soria Parra <dsp@php.net>
Fri, 26 Apr 2013 10:41:08 +0000 (12:41 +0200)
* PHP-5.5:
  Fix implicit declaration warning for cdf_timestamp_to_timespec
  Fix #64711 ("value computed but not used" in parse_date.c)
  Fix implicit uint* to int* conversion warning
  Fix conversion from unsigned char to char
  Fix #64712 (Obsolete declarations in php_date.c)


Trivial merge