colder Fri, 09 Jul 2010 12:02:41 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301122
Log:
Allow conflicts
Changed paths:
U php/php-src/branches/LEMON/Zend/Makefile.am
Modified: php/php-src/branches/LEMON/Zend/Makefile.am
===================================================================
--- php/php-src/branches/LEMON/Zend/Makefile.am 2010-07-09 11:43:27 UTC (rev
301121)
+++ php/php-src/branches/LEMON/Zend/Makefile.am 2010-07-09 12:02:41 UTC (rev
301122)
@@ -35,7 +35,7 @@
zend_language_parser.h: zend_language_parser.c
zend_language_parser.c: $(srcdir)/zend_language_parser.y
- $(LEMON) -q -c $(srcdir)/zend_language_parser.y
+ $(LEMON) -q -c $(srcdir)/zend_language_parser.y || test $? -eq 25
# INI parser/scanner rules
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
