aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorjrburke <jrburke@gmail.com>2011-11-14 12:13:25 -0500
committertimmywil <timmywillisn@gmail.com>2011-11-14 12:13:25 -0500
commit8bc60bab5dd9747e7ae06c3fdb0c60782d346ff0 (patch)
tree90008a3a96f1ccb50f0a69f3f782fdcf3f075a8c /Makefile
parent499d7e409c4f4d4ed255148e59552763cccf4260 (diff)
downloadjquery-8bc60bab5dd9747e7ae06c3fdb0c60782d346ff0.tar.gz
jquery-8bc60bab5dd9747e7ae06c3fdb0c60782d346ff0.zip
Landing pull request 586. Create exports.js for exporting jQuery to window and AMD. Fixes #10687.
More Details: - https://github.com/jquery/jquery/pull/586 - http://bugs.jquery.com/ticket/10687
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2bc41a070..b33fc2ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ BASE_FILES = ${SRC_DIR}/core.js\
${SRC_DIR}/ajax/xhr.js\
${SRC_DIR}/effects.js\
${SRC_DIR}/offset.js\
- ${SRC_DIR}/dimensions.js
+ ${SRC_DIR}/dimensions.js\
+ ${SRC_DIR}/exports.js
MODULES = ${SRC_DIR}/intro.js\
${BASE_FILES}\