Merge branch 'origin/master'

Conflicts: curvedLines.js
13 years ago · 5080965723
parent 84a5c2e9d9 552fc797ef
commit 5080965723
1 changed files with 12 additions and 0 deletions
--- a/.project
+++ b/.project
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>CurvedLinesGit</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 	</buildSpec>
 	<natures>
 		<nature>com.aptana.projects.webnature</nature>
 	</natures>
 </projectDescription>