.vagrant/** sdp/** .DS_Store *.pyc
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#2 | 23205 | Robert Cowham | Merged all changes from dev to test | ||
#1 | 18586 | Robert Cowham | Branching using cowhamr.sdp.dev | ||
//guest/perforce_software/sdp/dev/test/.p4ignore | |||||
#1 | 16029 | C. Thomas Tyler |
Routine merge to dev from main using: p4 merge -b perforce_software-sdp-dev |
||
//guest/perforce_software/sdp/main/test/.p4ignore | |||||
#1 | 15838 | C. Thomas Tyler | Added .p4ignore file to avoid .vagrant folder. |