Permalink
Browse files

Merge branch 'master' of git://github.com/KevinGrandon/microjs.com in…

…to nwt

Conflicts:
	data.js
  • Loading branch information...
2 parents f86fc38 + a5d112f commit 7c06a4cf82f2d9f18ba4f62461c6c5c3392326a2 @rvagg rvagg committed Nov 12, 2012
Showing with 9 additions and 1 deletion.
  1. +9 −1 data.js
View
10 data.js
@@ -1899,7 +1899,7 @@ var MicroJS = [
},
{
name: "Craft.js",
- tags: ["base", "dom", "events", "ajax", "polyfill", "functional"],
+ tags: ["framework","base", "dom", "events", "ajax", "polyfill", "functional"],
description: "Craft.js is a small but powerful JavaScript framework that helps you to build web apps easily.",
url: "http://craftjs.org",
source: "https://raw.github.com/mlbli/craft/master/craft.js"
@@ -1939,5 +1939,13 @@ var MicroJS = [
description: "A self-contained modal popup library",
url: "https://github.com/Nycto/PicoModal",
source: "https://raw.github.com/Nycto/PicoModal/master/picoModal.js"
+ },
+ {
+ name: "nwt",
+ github: "nwtjs/nwt",
+ tags: ["framework","base", "dom", "webkit", "ajax", "events", "mobile", "animation", "transitions"],
+ description: "Small JS framework that ships with ajax, anim, dom, and event methods. Several plugins available.",
+ url: "http://nwtjs.org",
+ source: "https://raw.github.com/nwtjs/nwt/master/nwt.js"
}
];

0 comments on commit 7c06a4c

Please sign in to comment.