Merge remote branch 'origin/master'

This commit is contained in:
scottjehl 2011-04-14 18:10:27 -04:00
commit 093d3b1a22

View file

@ -104,7 +104,7 @@ js: init
# Build the minified JS file
min: init js
@@head -8 js/jquery.mobile.core.js | ${SED_VER} > ${OUTPUT}/${MIN}
@@java -jar build/google-compiler-20100917.jar --js ${OUTPUT}/${JS} --warning_level QUIET --js_output_file ${MIN}.tmp
@@java -jar build/google-compiler-20110405.jar --js ${OUTPUT}/${JS} --warning_level QUIET --js_output_file ${MIN}.tmp
@@cat ${MIN}.tmp >> ${OUTPUT}/${MIN}
@@rm -f ${MIN}.tmp