03f2689f9e9e69ea8b42a8f41c8159e3bd1054e8
Merge parents 95b576d 2cf3e98
kate
  Thu Jun 30 16:24:12 2011 -0700
Merging with origin
diff --cc src/hg/lib/make.out
index 0000000,0000000..76a6512
new file mode 100644
--- /dev/null
+++ src/hg/lib/make.out
@@@ -1,0 -1,0 +1,71 @@@
++gcc -O -g  -Wall -Werror -Wformat -Wimplicit -Wreturn-type -Wuninitialized    -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_x86_64 -DUSE_SSL -DCOLOR32 -DUSE_BAM -DKNETFILE_HOOKS -DUSE_TABIX -DKNETFILE_HOOKS -Wall -Werror -Wformat -Wimplicit -Wreturn-type -Wuninitialized -I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc  -I/hive/data/outside/samtools/svn_x86_64/samtools -I/hive/data/outside/tabix/tabix-0.2.3/x86_64 -I/usr/include/mysql -o hui.o -c hui.c
++cc1: warnings being treated as errors
++hui.c: In function 'extraUiLinks':
++hui.c:284: warning: too few arguments for format
++hui.c:1029: error: invalid storage class for function 'baseColorGotCds'
++hui.c:1049: error: invalid storage class for function 'baseColorGotSequence'
++hui.c:1070: error: invalid storage class for function 'baseColorDropLists'
++hui.c:1145: error: invalid storage class for function 'tdbOrCartBoolean'
++hui.c:1154: error: invalid storage class for function 'indelAppropriate'
++hui.c:1164: error: invalid storage class for function 'indelEnabledByName'
++hui.c:1201: error: invalid storage class for function 'indelShowOptionsWithName'
++hui.c:1803: error: invalid storage class for function 'addMrnaFilter'
++hui.c:2032: error: invalid storage class for function 'parseAssignment'
++hui.c:2046: error: invalid storage class for function 'getPrimaryType'
++hui.c:2075: error: invalid storage class for function 'labelRoot'
++hui.c:2101: error: invalid storage class for function 'dividersSettingGet'
++hui.c:2115: error: invalid storage class for function 'dividersFree'
++hui.c:2134: error: invalid storage class for function 'hierarchySettingGet'
++hui.c:2170: error: invalid storage class for function 'hierarchyFree'
++hui.c:2259: error: invalid storage class for function 'dimensionSettingsGet'
++hui.c:2295: error: invalid storage class for function 'dimensionsFree'
++hui.c:2388: error: invalid storage class for function 'subgroupMembersGet'
++hui.c:2448: error: invalid storage class for function 'membersSubGroupIx'
++hui.c:2461: error: invalid storage class for function 'subgroupMembersFree'
++hui.c:2476: error: invalid storage class for function 'subgroupMembersWeedOutEmpties'
++hui.c:2566: error: invalid storage class for function 'abcMembersChecked'
++hui.c:2614: error: invalid storage class for function 'membersForAllSubGroupsWeedOutEmpties'
++hui.c:2653: error: invalid storage class for function 'membersForAllSubGroupsGet'
++hui.c:2738: error: invalid storage class for function 'membersForAllFindSubGroupIx'
++hui.c:2762: error: invalid storage class for function 'membersForAllSubGroupsFree'
++hui.c:2813: error: invalid storage class for function 'subgroupMembershipGet'
++hui.c:2865: error: invalid storage class for function 'membershipInAllCurrentABCs'
++hui.c:2945: error: invalid storage class for function 'subtrackInAllCurrentABCs'
++hui.c:3152: error: invalid storage class for function 'sortableTdbItemsCmp'
++hui.c:3200: error: invalid storage class for function 'colonPairToStrings'
++hui.c:3221: error: invalid storage class for function 'colonPairToInts'
++hui.c:3243: error: invalid storage class for function 'colonPairToDoubles'
++hui.c:3387: error: invalid storage class for function 'filterByClauseStd'
++hui.c:3577: error: invalid storage class for function 'checkBoxIdMakeForTrack'
++hui.c:3605: error: invalid storage class for function 'checkBoxIdFree'
++hui.c:3612: error: invalid storage class for function 'divisionIfNeeded'
++hui.c:3641: error: invalid storage class for function 'indentIfNeeded'
++hui.c:3793: error: invalid storage class for function 'cfgLinkToDependentCfgs'
++hui.c:3805: error: invalid storage class for function 'compositeUiSubtracks'
++hui.c:4213: error: invalid storage class for function 'compositeUiSubtracksMatchingPrimary'
++hui.c:4265: error: invalid storage class for function 'makeAddClearSubmitTweak'
++hui.c:4279: error: invalid storage class for function 'cfgBeginBoxAndTitle'
++hui.c:4305: error: invalid storage class for function 'cfgEndBox'
++hui.c:4543: error: invalid storage class for function 'getScoreDefaultsFromTdb'
++hui.c:4563: error: invalid storage class for function 'getScoreLimitsFromTdb'
++hui.c:4618: error: invalid storage class for function 'getScoreIntRangeFromCart'
++hui.c:4665: error: invalid storage class for function 'getScoreFloatRangeFromCart'
++hui.c:4711: error: invalid storage class for function 'showScoreFilter'
++hui.c:4790: error: invalid storage class for function 'numericFiltersShowAll'
++hui.c:5358: error: invalid storage class for function 'isSpeciesOn'
++hui.c:5948: error: invalid storage class for function 'compositeViewCfgExpandedByDefault'
++hui.c:5990: error: invalid storage class for function 'hCompositeDisplayViewDropDowns'
++hui.c:6148: error: invalid storage class for function 'buttonsForAll'
++hui.c:6153: error: invalid storage class for function 'buttonsForOne'
++hui.c:6160: error: invalid storage class for function 'matrixXheadingsRow1'
++hui.c:6218: error: invalid storage class for function 'matrixXheadingsRow2'
++hui.c:6248: error: invalid storage class for function 'matrixXheadings'
++hui.c:6260: error: invalid storage class for function 'matrixYheadings'
++hui.c:6293: error: invalid storage class for function 'displayABCdimensions'
++hui.c:6350: error: invalid storage class for function 'labelWithVocabLinkForMultiples'
++hui.c:6413: error: invalid storage class for function 'compositeUiByFilter'
++hui.c:6494: error: invalid storage class for function 'compositeUiByMatrix'
++hui.c:6695: error: invalid storage class for function 'compositeUiAllButtons'
++hui.c:6715: error: invalid storage class for function 'compositeUiNoMatrix'
++hui.c:7284: error: expected declaration or statement at end of input
++make: *** [hui.o] Error 1