Merge branch '1.8'

gobb · Feb 11, 2013 · ad39d7c · ad39d7c
2 parents 89f8c8b + 25db5be
commit ad39d7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -47,8 +47,8 @@
         <echo>Creating api documentation using PHP documentor</echo>
         <echo>Writing to ${sabredav.apidocspath}</echo>
         <exec command="phpdoc parse -t ${sabredav.apidocspath} -d lib/" passthru="1" />
-        <exec command="bin/phpdocmd ${sabredav.apidocspath}/structure.xml ${sabredav.apidocspath}" passthru="1" />
-        <delete file="${sabredav.apidocspath}/structure.xml" />
+        <exec command="bin/phpdocmd ${sabredav.apidocspath}/structure.xml ${sabredav.apidocspath} --lt %c" passthru="1" />
+        <!--<delete file="${sabredav.apidocspath}/structure.xml" />-->
 
     </target>
 

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     },
     "require-dev" : {
         "phpunit/phpunit" : "3.7.*",
-        "evert/phpdoc-md" : "0.0.*",
+        "evert/phpdoc-md" : "~0.0.7",
         "phing/phing" : "2.4.14"
     },
     "provide" : {