Resolved merge conflict

marshallmick007 · May 30, 2011 · 902e868 · 902e868
1 parent 1e36aca
commit 902e868
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/js/app.js b/js/app.js
@@ -212,6 +212,18 @@ EveryJS.libraries = [
     ],
     size: "1MB or lower, depending on build",
     tags: ['ui']
+  },
+  {
+    name: "oCanvas",
+    website: "http://ocanvas.org/",
+    description: "JavaScript library for object-based canvas drawing.",
+    useIf: [
+      "You want to build things with HTML5 Canvas a bit easier."
+    ],
+    dependencies: null,
+    license: "MIT",
+    tags: ['canvas'],
+    size: 15
   }
 ];