9a49290fedc8b4f9c7a631dedcfe8ac3aa2b4cee
chinhli
  Thu Oct 20 14:10:43 2011 -0700
merge conflict resolved
diff --git src/hg/js/makefile src/hg/js/makefile
index 1c00d22..a595be6 100644
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@ -1,25 +1,25 @@
 include ../../inc/common.mk
 
 # recursive target to do install to DEST, with extra excludes EXCL.
 
 JQUERY_FILES=jquery-1.2.6.pack.js jquery.js jquery.tablednd.js \
     jquery.imgareaselect.js jquery-ui.js jquery.contextmenu.js \
     ui.dropdownchecklist.js \
     jquery.cookie.js jquery.watermarkinput.js
 
-JS_FILES=ajax.js autocomplete.js hgGateway.js hgHubConnect.js hgTracks.js \
+JS_FILES=ajax.js autocomplete.js hgCustom.js hgGateway.js hgHubConnect.js hgSession.js hgTracks.js \
     hui.js utils.js ddcl.js \
     encodeProject.js encodeDataSummary.js encodeDataMatrix.js encodeChipMatrix.js \
     ${JQUERY_FILES}
 
 STATIC_FILES=staticDoc.js jquery.js
 
 ifdef LOWELAB
     JS_FILES += lowetooltip.js loweautocomplete.js
 endif
 
 user:
 	if test -d ${DOCUMENTROOT}-${USER}; then \
 	    ${MAKE} doInstall DEST=${DOCUMENTROOT}-${USER}/js/${USER}; \
 		cp ${STATIC_FILES} ${DOCUMENTROOT}-${USER}/js; \
 	else \