Permalink
Browse files

Merge branch 'master' of github.com:KuraFire/runloop

Conflicts:
	documentation.md
  • Loading branch information...
2 parents d726b6e + 516547c commit 5b70a6059992924f5edc7314eb4bef5fd3f7e85c @KuraFire committed Feb 6, 2011
Showing with 6 additions and 0 deletions.
  1. +6 −0 documentation.md
View
@@ -9,9 +9,15 @@ From the Readme:
> Runloop was created to have more power, more control and less hassle than dealing with jQuery `.animate()` callbacks. It hooks into jQuery's Effects Queue by design, to avoid timing conflicts in the case of doing many multiple `.animate()` calls.
+<<<<<<< HEAD
[Runloop Demo](http://files.farukat.es/creations/runloop/)
[Announcement post](http://farukat.es/p514)
+=======
+Demo: http://files.farukat.es/creations/runloop/
+
+Announcement post: http://farukat.es/p514
+>>>>>>> 516547cb387f9595cf311c883613f26e454bafdb
## Basic Usage

0 comments on commit 5b70a60

Please sign in to comment.