p4 integ branch/2007-04-18/diag/... master/...
p4 resolve -as master/...
Non -as resolves:
design/index.html - easy dirty merge
code/w3build.bat -ay
code/version.c -ay
code/comm.gmk -at
code/commpost.nmk -at
code/poolmrg.c -am
code/trace.c -at
mpmtypes has unwanted code from the merge, this will be cleaned
up in another change (it's just simpler that way).
Copied from Perforce
Change: 162839
ServerID: perforce.ravenbrook.com
Show that after finding one RankFINAL segment, traceFindGrey then
goes back to RankEXACT segs before tracing the next RankFINAL segment.
Copied from Perforce
Change: 162626
ServerID: perforce.ravenbrook.com
Making some new files consistent with changes from that branch.
Deleting some new Global Graphics confidential files.
Copied from Perforce
Change: 30256
ServerID: perforce.ravenbrook.com
This change will be integrated but ignored (-ay) to the gg-epcore/union sources, so that they retain HopeNames.
Copied from Perforce
Change: 24911
ServerID: perforce.ravenbrook.com
This was achieved by partially undoing changelist 24817, including an accidental corruption of eventgen.pl.
Copied from Perforce
Change: 24877
ServerID: perforce.ravenbrook.com