Merge zend branch into trunk

git-svn-id: http://php-reader.googlecode.com/svn/trunk@177 51a70ab9-7547-0410-9469-37e369ee0574
2010-03-09 13:13:34 +00:00
parent 70b01ce22e 776aacbe3a
commit b3534b1ed7
466 changed files with 34633 additions and 32013 deletions
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,2 +1,7 @@
-source.encoding=UTF-8
-version=4
+include.path=${php.global.include.path}
+source.encoding=UTF-8
+src.dir=src
+tags.asp=false
+tags.short=true
+test.src.dir=tests
+web.root=.