Merge branches 'staged' and 'drag_and_drop' into staged

asalga · Apr 23, 2011 · 6665e3f · 6665e3f
2 parents 078673c + 35748d4
commit 6665e3f
Show file tree

Hide file tree

Showing 7 changed files with 222 additions and 1,047,811 deletions.
diff --git a/clouds/lion.asc b/clouds/lion.asc
diff --git a/clouds/lion.psi b/clouds/lion.psi
diff --git a/demos/drag and drop/cloud.png b/demos/drag and drop/cloud.png
diff --git a/demos/drag and drop/demo.js b/demos/drag and drop/demo.js
diff --git a/demos/drag and drop/index.html b/demos/drag and drop/index.html
diff --git a/demos/simple/example.js → demos/simple/demo.js b/demos/simple/example.js → demos/simple/demo.js
diff --git a/demos/simple/example.html → demos/simple/index.html b/demos/simple/example.html → demos/simple/index.html