49234d4f24e579dc5f6677b72b21d060bd092ef7
Merge parents 3d0e390 373fab2
kate
  Sat Oct 29 20:38:29 2011 -0700
Merge branch 'matrix'
diff --cc src/hg/js/makefile
index c892284,e82bb10..255dd68
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@@ -1,25 -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
+     jquery.cookie.js jquery.watermarkinput.js jquery.floatheader.js
  
 -JS_FILES=ajax.js autocomplete.js hgCustom.js hgGateway.js hgHubConnect.js hgSession.js hgTracks.js \
 +JS_FILES=ajax.js autocomplete.js hgCustom.js hgGateway.js hgHubConnect.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 \