# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#2 | 4371 | Chris Comparini | No longer needed in this branch. | ||
#1 | 4331 | Chris Comparini |
Branch of what I hope is _everyone's_ jam branches, if that makes sense. |
||
//guest/craig_mcpheeters/work/jam/src/expand.h | |||||
#3 | 3183 | Craig Mcpheeters | Integration of my jam mainline branch into my work branch. | ||
#2 | 785 | Craig Mcpheeters |
Integration from //guest/craig_mcpheeters/jam/src/... This work area now contains both the Alias|Wavefront changes, and the latest integrations from the mainline. There are some changes in this area which shouldn't be merged back into the mainline. As I merge this branch back into my jam/src/... branch, I'll leave out a few of the changes. |
||
#1 | 777 | Craig Mcpheeters |
Branch of my jam/src/... area. This new area establishes the integration base for the copy of Jam which has all the changes. |
||
//guest/craig_mcpheeters/jam/src/expand.h | |||||
#2 | 617 | Craig Mcpheeters | Integration from mainline as of @3 | ||
#1 | 616 | Craig Mcpheeters | Integration from Jam mainline, as of @2 |