190ba8082f1e7f99ab7ee3038b1b2eefb5791357
Merge parents 66e096c ed22a78
kate
  Thu Nov 10 17:26:32 2016 -0800
Resolving merge conflicts

diff --cc src/hg/makefile
index 22394e3,9551bf9..92d33bf
--- src/hg/makefile
+++ src/hg/makefile
@@@ -1,30 -1,30 +1,30 @@@
  # Build all directories in utils
  
  kentSrc = ..
  include ${kentSrc}/inc/localEnvironment.mk
  
  # 	$Id: makefile,v 1.156 2010/03/03 02:53:30 markd Exp $
  
  BROWSER_BINS=cartReset das hgBlat makeDb/hgCgiData hgConvert hgHubConnect \
          hgGateway hgGene hgGenome hgIntegrator hgLogin hgPcr hgSession hgSuggest \
          hgTables hgTracks hgTrackUi hgUserSuggestion hgc hgApi cartDump near/hgNear \
  	hgLiftOver hgVai visiGene/hgVisiGene hgMenubar hgPublicSessions \
  	encode/hgEncodeDataVersions \
  	encode/hgEncodeVocab encode/hgEncodeApi \
- 	phyloGif hgCustom hgPal hgFileUi hgFileSearch\
+ 	phyloPng hgCustom hgPal hgFileUi hgFileSearch\
 -	makeDb/hgCgiData js htdocs/style hgMirror hgBeacon
 +	makeDb/hgCgiData js htdocs/style hgMirror hgBeacon hgGtexTrackSettings
  
  ifdef LOWELAB
      BROWSER_BINS += $(HOME)/lowelab/src/browser/tooltip $(HOME)/lowelab/src/browser/chooseorg
  endif
  
  BROWSER_LOADERS = makeDb/hgLoadBed makeDb/hgLoadWiggle makeDb/hgLoadMaf
  
  ifneq ($(findstring $(shell hostname),hgwdev hgwbeta),)
      ENCODE_FILES = encode3/encodeDataWarehouse
  endif
  
  
  TEST_DIRS = lib autoDtd autoSql blastToPsl checkTableCoords embossToPsl \
              genePredSingleCover genePredHisto genePredToBed genePredToGtf \
  	    genePredToMafFrames gbGetEntries hgGetAnn liftAcross liftOver \