235301fd42a93e1ba15678074735ca2ce7ffe3d6
Merge parents caa4f9e ffae904
tdreszer
  Fri Dec 2 11:08:58 2011 -0800
Merge branch 'master' into tdreszer-subCfg
diff --cc src/hg/lib/trackDbCustom.c
index 049aad8,7a9a136..11e0730
--- src/hg/lib/trackDbCustom.c
+++ src/hg/lib/trackDbCustom.c
@@@ -3,33 -3,31 +3,32 @@@
   * MySQL table out of the trackDb.ra files. */
  
  #include "common.h"
  #include "linefile.h"
  #include "jksql.h"
  #include "trackDb.h"
  #include "hdb.h"
  #include "hui.h"
  #include "ra.h"
  #include "hash.h"
  #include "net.h"
  #include "sqlNum.h"
  #include "obscure.h"
  #include "hgMaf.h"
  #include "customTrack.h"
 +#include "regexHelper.h"
  
- static char const rcsid[] = "$Id: trackDbCustom.c,v 1.90 2010/05/18 22:37:36 kent Exp $";
  
  /* ----------- End of AutoSQL generated code --------------------- */
  
  struct trackDb *trackDbNew()
  /* Allocate a new trackDb with just very minimal stuff filled in. */
  {
  struct trackDb *tdb;
  AllocVar(tdb);
  tdb->canPack = 2;	/* Unknown value. */
  return tdb;
  }
  
  int trackDbCmp(const void *va, const void *vb)
  /* Compare to sort based on priority; use shortLabel as secondary sort key.
   * Note: parallel code to hgTracks.c:tgCmpPriority */