merge complete

FotoVerite · FotoVerite · commit 9e18c896bb93 · 2010-05-30T02:34:03.000-04:00
diff --git a/BUILD/docs.js b/BUILD/docs.js
@@ -18,7 +18,7 @@
   </tr>
 </table>
 <h1>what is javascript-fu?</h1>
-<p>javascript-fu (or js-fu) is a martial arts discipline (library) for node.js and the browser. through mastering the art of javascript-fu you will be a nimble, yet powerful JavaScript developer. a true javascript-fu master can avoid the bad parts of javascript with ninja-like agility and perform quick and devastating blows to produce robust, succinct code that covers a myriad of common functionalities.</p>
+<p>javascript-fu is a martial arts discipline (library) for node.js and the browser. through mastering the art of javascript-fu you will be a nimble, yet powerful JavaScript developer. a true javascript-fu master can avoid the bad parts of javascript with ninja-like agility and perform quick and devastating blows to produce robust, succinct code that covers a myriad of common functionalities.</p>
 <h1>where did javascript-fu come from?</h1>
 <p>javascript-fu is the culmination of years of training in the archaic art of javascript. through meticulously studying the following ancient scrolls we have divined the ultimate form of javascript martial arts. </p>
 <ul>
diff --git a/Readme.md b/Readme.md
@@ -18,7 +18,7 @@
   </tr>
 </table>
 <h1>what is javascript-fu?</h1>
-<p>javascript-fu (or js-fu) is a martial arts discipline (library) for node.js and the browser. through mastering the art of javascript-fu you will be a nimble, yet powerful JavaScript developer. a true javascript-fu master can avoid the bad parts of javascript with ninja-like agility and perform quick and devastating blows to produce robust, succinct code that covers a myriad of common functionalities.</p>
+<p>javascript-fu is a martial arts discipline (library) for node.js and the browser. through mastering the art of javascript-fu you will be a nimble, yet powerful JavaScript developer. a true javascript-fu master can avoid the bad parts of javascript with ninja-like agility and perform quick and devastating blows to produce robust, succinct code that covers a myriad of common functionalities.</p>
 <h1>where did javascript-fu come from?</h1>
 <p>javascript-fu is the culmination of years of training in the archaic art of javascript. through meticulously studying the following ancient scrolls we have divined the ultimate form of javascript martial arts. </p>
 <ul>
diff --git a/examples/js/js-fu.js b/examples/js/js-fu.js
@@ -1,4 +1,4 @@
-/*************** AUTOGENERATED @ 1275201079701 ***************
+/*************** AUTOGENERATED @ 1275201290109 ***************
     WARNING: THIS FILE WAS AUTOGENERATED BY THE JS-FU BUILD SCRIPT
     MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING 
     THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!!
diff --git a/js-fu.js b/js-fu.js
@@ -1,4 +1,4 @@
-/*************** AUTOGENERATED @ 1275201079701 ***************
+/*************** AUTOGENERATED @ 1275201290109 ***************
     WARNING: THIS FILE WAS AUTOGENERATED BY THE JS-FU BUILD SCRIPT
     MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING 
     THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!!

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/************* AUTOGENERATED @ 1275201079701 *************`
	`1`	`+/************* AUTOGENERATED @ 1275201290109 *************`
`2`	`2`	`WARNING: THIS FILE WAS AUTOGENERATED BY THE JS-FU BUILD SCRIPT`
`3`	`3`	`MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING`
`4`	`4`	`THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!!`