Merge branch 'origin/master'

Conflicts: curvedLines.js

Merge branch 'origin/master'
Conflicts: curvedLines.js
50809657 · MichaelZinsmaier · 84a5c2e9 · 552fc797 · 50809657
Commit 50809657 authored Sep 21, 2013 by MichaelZinsmaier
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

.project .project +12 -0

No files found.
--- a/.project
+++ b/.project
+<?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>