.vagrant/** output/** sdp/** .DS_Store *.pyc local_*.env local_*.sh podman_credentials.local.txt log.*.txt
| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #2 | 32659 | C. Thomas Tyler |
Merge down dev -> dev_rebrand. Local changes to template.sh were discareded; we'll need to redo those. |
||
| #1 | 31751 | C. Thomas Tyler | p4 stream convertsparse | ||
| //p4-sdp/dev/test/.p4ignore | |||||
| #1 | 31397 | C. Thomas Tyler | Populate -b SDP_Classic_to_Streams -s //guest/perforce_software/sdp/...@31368. | ||
| //guest/perforce_software/sdp/dev/test/.p4ignore | |||||
| #3 | 27615 | C. Thomas Tyler | Tweaked .p4ignore for test folder. | ||
| #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. | ||