Merge branch 'master' of git://github.com/alicelieutier/microjs.com

Conflicts: atom.xml data-min.js data.js
microjs · Mar 11, 2013 · 351deb3 · 351deb3
2 parents bef793d + ef15a11
commit 351deb3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/atom.xml b/atom.xml
@@ -2337,14 +2337,4 @@
 		<updated>2013-02-06'T'10:18:53Z</updated>
 		<summary>A lightweight framework for building de-coupled apps</summary>
 	</entry>
-
-	<entry>
-		<title>PinkySwear.js</title>
-		<link href="https://github.com/timjansen/pinkyswear.js" />
-		<id>urn:uuid:c0ddb620-724d-11e2-8b8d-e7b67bffa613</id>
-		<updated>2013-02-09'T'00:14:44Z</updated>
-		<summary>A tiny implementation of the Promises/A+ specification.</summary>
-	</entry>
-
-
-</feed>
+</feed>
diff --git a/data-min.js b/data-min.js
diff --git a/data.js b/data.js
@@ -2198,6 +2198,7 @@ var MicroJS = [
     source: "https://raw.github.com/Calamari/BehaviorTree.js/master/btree-complete.js"
   },
   {
+<<<<<<< HEAD
     name: "PinkySwear.js",
     tags: ["promises"],
     description: "A tiny implementation of the Promises/A+ specification.",
@@ -2231,5 +2232,12 @@ var MicroJS = [
     description: "A small library to brew JavaScript objects.",
     url: "https://github.com/dfernandez79/barman",
     source: "https://raw.github.com/dfernandez79/barman/master/src/barman.js"
+  },
+  {
+    name: "smoothScroll.js",
+    tags: ["scroll", "smooth"],
+    description: "A teeny tiny, ease-in-out, smooth scroll library with no dependency",
+    url: "https://github.com/alicelieutier/smoothScroll",
+    source: "https://raw.github.com/alicelieutier/smoothScroll/master/smoothscroll.js"
   }
 ];