Merge branch 'patch-1' of https://github.com/ashes999/craftyjs.github…

….com into ashes999-patch-1 Conflicts: components/components.json
craftyjs · Mar 22, 2014 · 09d7d8c · 09d7d8c
2 parents 10dce03 + f18c965
commit 09d7d8c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/components/components.json b/components/components.json
@@ -2,4 +2,5 @@
   {"name":"TiledMapBuilder", "link": "https://github.com/Kibo/TiledMapBuilder"}
 , {"name":"ProgressBar", "link": "https://github.com/mucaho/crafty-component-progressbar"}
 , {"name":"Timer", "link": "https://github.com/deengames/a-day-and-a-night/blob/master/src/components/timer.js"}
+, {"name":"FPS Counter", "link": "https://github.com/deengames/a-day-and-a-night/blob/master/src/components/fps.js"}
 ]