delta/php-git.git/ext/tokenizer, branch php-5.5.18 git.php.net: repository/php-src.git Merge branch 'PHP-5.4' into PHP-5.5 2014-02-14T13:30:00+00:00 Lior Kaplan kaplanlior@gmail.com 2014-02-14T13:30:00+00:00 c09bd9def008f67853796ff4e31e581a9c31636c 






a few typofixes
2014-02-14T12:51:10+00:00

Veres Lajos
vlajos@gmail.com

2014-02-14T12:51:10+00:00

35101e9ef4669bb076f6687f2fd1aa13f63695d0












Bump year
2014-01-03T03:06:16+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:06:16+00:00

47c902777297ce895aa915c13efdb00881af3669












Bump year
2014-01-03T03:04:26+00:00

Xinchen Hui
laruence@php.net

2014-01-03T03:04:26+00:00

c0d060f5c02db168f1de895b41afffbc6e3cacfb












Happy New Year
2013-01-01T08:37:09+00:00

Xinchen Hui
laruence@php.net

2013-01-01T08:37:09+00:00

a666285bc2488b7f7362368c388e41428610ad1d












Happy New Year
2013-01-01T08:28:54+00:00

Xinchen Hui
laruence@php.net

2013-01-01T08:28:54+00:00

0a7395e009b2df94c2a3f05aef69fb1779edf8f8












Fix test failed due to new Token T_YIELD
2012-09-02T05:15:23+00:00

Xinchen Hui
laruence@php.net

2012-09-02T05:15:23+00:00

4e84f725544153d5b6fff99adc274d11f79b9079












Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
2012-08-20T11:37:53+00:00

Nikita Popov
nikic@php.net

2012-08-20T11:37:53+00:00

1823b16fa15894f72fc01724766289dbecf5a62a

Merging master to fix Windows build

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_vm_def.h





Merging master to fix Windows build

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_vm_def.h







add finally
2012-08-20T04:43:16+00:00

Stanislav Malyshev
stas@php.net

2012-08-20T04:43:16+00:00

5ee3bf16474bd94f4813714491742fb17e258d18












Merge branch 'pull-request/31'
2012-08-20T04:43:04+00:00

Stanislav Malyshev
stas@php.net

2012-08-20T04:42:28+00:00

3336e1e78c48cabf51c1a502ac84f20cd732981f

* pull-request/31:
  Fix lexing of nested heredoc strings in token_get_all()





* pull-request/31:
  Fix lexing of nested heredoc strings in token_get_all()