Permalink
Browse files

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

Conflicts:
	atom.xml
	data-min.js
	data.js
  • Loading branch information...
2 parents 351deb3 + 4f17fd9 commit 54ae66e72270e881b1702e0756c1f9fc81d6009f @rvagg rvagg committed Mar 11, 2013
Showing with 20 additions and 1 deletion.
  1. +4 −0 data-min.js
  2. +16 −1 data.js
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
17 data.js
@@ -2198,6 +2198,7 @@ var MicroJS = [
source: "https://raw.github.com/Calamari/BehaviorTree.js/master/btree-complete.js"
},
{
+<<<<<<< HEAD
<<<<<<< HEAD
name: "PinkySwear.js",
tags: ["promises"],
@@ -2239,5 +2240,19 @@ var MicroJS = [
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"
+ },
+ {
+ name: "strftime",
+ tags: ["strftime", "format", "date", "time"],
+ description: "strftime for JavaScript. Works in Node and browsers.",
+ url: "https://github.com/samsonjs/strftime",
+ source: "https://raw.github.com/samsonjs/strftime/master/strftime.js"
+ },
+ {
+ name: "format",
+ tags: ["format", "printf", "sprintf", "vsprintf", "string"],
+ description: "printf, sprintf, and vsprintf for JavaScript. Works in Node and browsers.",
+ url: "https://github.com/samsonjs/format",
+ source: "https://raw.github.com/samsonjs/format/master/format.js"
}
-];
+];

0 comments on commit 54ae66e

Please sign in to comment.