| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #3 | 22142 | Robert Cowham | Merge in latest changes from Dev | ||
| #2 | 20726 | Robert Cowham | Catch up from dev | ||
| #1 | 18586 | Robert Cowham | Branching using cowhamr.sdp.dev | ||
| //guest/perforce_software/sdp/dev/doc/SDP_Guide.Unix.odt | |||||
| #4 | 18538 | Robert Cowham | Include mention of recreate_offline_db | ||
| #3 | 16784 | C. Thomas Tyler |
Routine Merge Down to dev from main using: p4 -s merge -n -b perforce_software-sdp-dev |
||
| #2 | 15375 | adrian_waters | Routine merge-down from main->dev | ||
| #1 | 12028 | C. Thomas Tyler | Refreshed SDP dev branch, merging down from main. | ||
| //guest/perforce_software/sdp/dev/doc/SDP_Guide.Unix.docx | |||||
| #2 | 11463 | Russell C. Jackson (Rusty) | Updated dev to prepare for Summit agreed changes. | ||
| #1 | 10961 | C. Thomas Tyler | Merge down from main. | ||
| //guest/perforce_software/sdp/dev/doc/SDP_Guide.docx | |||||
| #2 | 10666 | C. Thomas Tyler |
Merge down from main. No actual merging was needed (just 'resolve -as'). |
||
| #1 | 10638 | C. Thomas Tyler | Populate perforce_software-sdp-dev. | ||
| //guest/perforce_software/sdp/main/doc/SDP_Guide.docx | |||||
| #1 | 10148 | C. Thomas Tyler | Promoted the Perforce Server Deployment Package to The Workshop. | ||