projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Isolate our version of jQuery in mkws-complete.js
[mkws-moved-to-github.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index
82cf254
..
86ebb77
100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-46,6
+46,7
@@
mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${J
echo "*/"; \
cat ${JQUERY_FILE}; \
cat ${JQUERY_JSON_FILE}; \
echo "*/"; \
cat ${JQUERY_FILE}; \
cat ${JQUERY_JSON_FILE}; \
+ echo 'mkws_jQuery = $.noConflict();'; \
cat ${HANDLEBARS_FILE}; \
cat ${PP2_FILE}; \
cat mkws.js; \
cat ${HANDLEBARS_FILE}; \
cat ${PP2_FILE}; \
cat mkws.js; \