adminpass* ropass* servicepass* localpasswd.txt .p4config* .p4passwd* .p4tickets* .p4trust* .p4root .svn .git .DS_Store *.swp *~
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#2 | 23430 | Robert Cowham | Merge in changes from dev | ||
#1 | 18586 | Robert Cowham | Branching using cowhamr.sdp.dev | ||
//guest/perforce_software/sdp/dev/.p4ignore | |||||
#3 | 16563 | C. Thomas Tyler |
Routine Merge Down to dev from main using: p4 merge -b perforce_software-sdp-dev p4 resolve -as |
||
#2 | 15778 | C. Thomas Tyler | Routine Merge Down to dev from main. | ||
#1 | 10638 | C. Thomas Tyler | Populate perforce_software-sdp-dev. | ||
//guest/perforce_software/sdp/main/.p4ignore | |||||
#1 | 10148 | C. Thomas Tyler | Promoted the Perforce Server Deployment Package to The Workshop. |