Skip to content
Browse files

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

Conflicts:
	data.js
  • Loading branch information...
2 parents 795bf5a + a5ebb68 commit a0df550d085e7c3bd68c3186d6d1f26c9d866645 @rvagg rvagg committed Mar 12, 2013
Showing with 8 additions and 0 deletions.
  1. +8 −0 data.js
View
8 data.js
@@ -9,6 +9,14 @@
var MicroJS = [
{
+ name: "Colors.js",
+ github: "matthewbj/Colors",
+ tags: ["color", "color manipulation"],
+ description: "Colors.js is an easy to use color-manipulation library that is lightweight and very functional.",
+ url: "http://matthewbj.github.com/Colors/",
+ source: "https://raw.github.com/matthewbj/Colors/master/colors.js"
+ },
+ {
name: "css-time.js",
github: "philbooth/css-time.js",
tags: ["css", "time", "string", "milliseconds", "convert", "conversion"],

0 comments on commit a0df550

Please sign in to comment.
Something went wrong with that request. Please try again.