resources/public/javascripts/build/wildfire_cms.combined.js resources/public/javascripts/build/wildfire_cms.combined.min.js resources/public/javascripts/build/wildfire_filesystem.js resources/public/javascripts/build/wildfire_filesystem.min.js @@ -15,7 +15,8 @@ JS_FILES = ${SRC_DIR}/jquery/jquery.tablesort.js\ ${SRC_DIR}/cms/file.js\ ${SRC_DIR}/cms/wildfire_users.js -JS_FILES2 = ${SRC_DIR}/upload/swfupload.js\ +JS_FILES2 = ${SRC_DIR}/jquery/jquery.1.3.2.js\ + ${SRC_DIR}/upload/swfupload.js\ ${SRC_DIR}/upload/swfupload.queue.js\ ${SRC_DIR}/upload/fileprogress.js\ ${SRC_DIR}/upload/handlers.js\ @@ -32,10 +33,10 @@ CSS_FILES = ${CSS_DIR}/cms/reset-fonts-grids.css\ ${CSS_DIR}/cms/relay.css -WE = ${BUILD_DIR}/jquery.132.combined.js -WE_MIN = ${BUILD_DIR}/jquery.132.combined.min.js -JS = ${BUILD_DIR}/jquery.126.files.js -JS_MIN = ${BUILD_DIR}/jquery.126.files.min.js +WE = ${BUILD_DIR}/wildfire_cms.combined.js +WE_MIN = ${BUILD_DIR}/wildfire_cms.combined.min.js +JS = ${BUILD_DIR}/wildfire_filesystem.js +JS_MIN = ${BUILD_DIR}/wildfire_filesystem.min.js CSS = ${CSS_DIR}/cms/wildfire.combined.css CSS_MIN = ${CSS_DIR}/cms/wildfire.combined.min.css Makefile cc202360cde6fe2a53ce37cb2b38b15c66418f13 charlesmarshall charles@oneblackbear.com http://github.com/phpwax/wildfire/commit/d8f5e4a03f626b5006b40fe53a1b90bb6fb17cba d8f5e4a03f626b5006b40fe53a1b90bb6fb17cba 2009-08-17T01:38:07-07:00 2009-08-17T01:38:07-07:00 new names for build files 4cfd5965c53fa7afb76bd1139cdbc086e287569d charlesmarshall charles@oneblackbear.com