Fixed merge

davglass · Sep 18, 2012 · bb6652d · bb6652d
2 parents c644b19 + 01e329c
commit bb6652d
Show file tree

Hide file tree

Showing 611 changed files with 7,206 additions and 6,018 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Links
   * [Contributor Info](http://yuilibrary.com/contribute/)
   * [Report a Bug](http://yuilibrary.com/yui/docs/tutorials/report-bugs/)
   * [![Build Status](https://secure.travis-ci.org/yui/yui3.png?branch=master)](http://travis-ci.org/yui/yui3)
-  * [Shifter, for building YUI](http://yui.github.com/yui/shifter)
+  * [Shifter, for building YUI](http://yui.github.com/shifter/)
 
 
 Source Info
@@ -67,7 +67,7 @@ The YUI source tree includes the following directories:
      modifications to the library and its documentation should take place in
      this directory.
 
-To build YUI components install [Shifter](http://yui.github.com/shifter) (`npm -g install shifter`)
+To build YUI components install [Shifter](http://yui.github.com/shifter/) (`npm -g install shifter`)
 and then simply run `shifter` in that components directory.
 
 Shifter also allows you to rebuild the entire YUI src tree:

diff --git a/build/align-plugin/align-plugin-min.js b/build/align-plugin/align-plugin-min.js
diff --git a/build/anim-base/anim-base-min.js b/build/anim-base/anim-base-min.js
diff --git a/build/anim-color/anim-color-min.js b/build/anim-color/anim-color-min.js
diff --git a/build/anim-curve/anim-curve-min.js b/build/anim-curve/anim-curve-min.js