Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Conflicts:
	atom.xml
	data-min.js
	data.js
  • Loading branch information...
commit 351deb381a190c0927900d632a6924086664a5fa 2 parents bef793d + ef15a11
Rod Vagg rvagg authored
Showing with 14 additions and 12 deletions.
  1. +1 −11 atom.xml
  2. +5 −1 data-min.js
  3. +8 −0 data.js
12 atom.xml
View
@@ -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>
6 data-min.js
View
5 additions, 1 deletion not shown
8 data.js
View
@@ -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"
}
];
Please sign in to comment.
Something went wrong with that request. Please try again.