.vagrant/** sdp/** .DS_Store *.pyc
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 24292 | gmc | "Forking branch Dev of perforce-software-sdp to gmc-sdp." | ||
//guest/perforce_software/sdp/dev/test/.p4ignore | |||||
#2 | 22957 | C. Thomas Tyler |
Merged two changes initiated on main down to: Change @22826 by robert_cowham: Ignore some files on Mac. Change @22950 by awkan/ttyler: Provide an override for difference between proxy listening port and target port |
||
#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. |