Permalink
Browse files

merged from dev

  • Loading branch information...
1 parent 07c0c13 commit 27ee971bba3605676f9444ff40d54c5b24100273 @niklasvh committed Sep 12, 2011
View
@@ -1,9 +1,14 @@
/nbproject/
/images/
+/external/
/tests/templates/
/tests/cache/
+/tests/flashcanvas.html
+/lib/
/dist/
/build/tmp.js
+/build/html2canvas.min.js
index.html
image.jpg
+screenshots.html
screenshots_local.html
View
@@ -1,21 +1,21 @@
/*
- * The MIT License
+ The MIT License
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
*/
View
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="html2canvas" basedir=".">
<property name="src.dir" location="src"/>
- <property name="lib.dir" location="lib"/>
+ <property name="lib.dir" location="../lib"/>
<property name="build.dir" location="build"/>
<property name="dist" location="dist"/>
@@ -17,17 +17,13 @@
<path id="sourcefiles">
<fileset dir="${src.dir}" includes="LICENSE"/>
<fileset dir="." includes="LICENSE"/>
- <fileset dir="${src.dir}" includes="Core.js"/>
- <fileset dir="${src.dir}" includes="Background.js"/>
- <fileset dir="${src.dir}" includes="Border.js"/>
- <fileset dir="${src.dir}" includes="Draw.js"/>
- <fileset dir="${src.dir}" includes="Forms.js"/>
- <fileset dir="${src.dir}" includes="Images.js"/>
+ <fileset dir="${src.dir}" includes="Core.js"/>
+ <fileset dir="${src.dir}" includes="Parse.js"/>
+ <fileset dir="${src.dir}" includes="Preload.js"/>
+ <fileset dir="${src.dir}" includes="Queue.js"/>
<fileset dir="${src.dir}" includes="Renderer.js"/>
- <fileset dir="${src.dir}" includes="Lists.js"/>
- <fileset dir="${src.dir}" includes="Text.js"/>
- <fileset dir="${src.dir}" includes="Traversing.js"/>
- <fileset dir="${src.dir}" includes="Util.js"/>
+
+
</path>
<path id="jquery-plugin">
@@ -48,7 +44,7 @@
</target>
- <target name="source">
+ <target name="build">
<concat fixlastline="yes" destfile="${build.dir}/${JS_NAME}">
<path refid="sourcefiles"/>
</concat>
Oops, something went wrong.

0 comments on commit 27ee971

Please sign in to comment.