0e594d3b2ff344384b4cd9c24761fe2f5ec79a1e
Merge parents 3df0f0e 37a5223
tdreszer
  Thu Nov 10 09:40:02 2011 -0800
merge-o-matic mania
diff --cc src/hg/inc/hui.h
index 4a16ee6,58cdc37..2de4a62
--- src/hg/inc/hui.h
+++ src/hg/inc/hui.h
@@@ -1,28 -1,26 +1,29 @@@
  /* hui - human genome browser user interface controls that are shared
   * between more than one CGI. */
  #ifndef HUI_H
  #define HUI_H
  
  #include "cart.h"
  #include "trackDb.h"
  #include "customTrack.h"
  #include "wiggle.h"
+ #include "asParse.h"
  
 +// This temporary define shouuld be removed after rollout of hgTrackUi subtrack cfg changes
 +#define SUBTRACK_CFG
 +
  struct lineFile;
  
  void setUdcCacheDir();
  /* set the path to the udc cache dir */
  
  char *hDownloadsServer();
  /* get the downloads server from hg.conf or the default */
  
  char *hUserCookie();
  /* Return our cookie name. */
  
  char *wrapWhiteFont(char *s);
  /* Write white font around s */
  
  #define HELP_DIR "/goldenPath/help"