<xml xmlns:o="urn:schemas-microsoft-com:office:office"> <o:MainFile HRef="../LivingOnTheEdge-AutomaticMerging.html"/> <o:File HRef="themedata.thmx"/> <o:File HRef="colorschememapping.xml"/> <o:File HRef="image001.png"/> <o:File HRef="image002.png"/> <o:File HRef="image003.png"/> <o:File HRef="filelist.xml"/> </xml>
| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #1 | 30556 | C. Thomas Tyler | Populate -r -S //automerge/dev. | ||
| //automerge/main/docs/LivingOnTheEdge-AutomaticMerging.fld/filelist.xml | |||||
| #1 | 30554 | C. Thomas Tyler |
A few refresher changes: * Updated copyrights for this project (2011 to 2024). * Fixed various doc typos and broken email links. * Tweaked comments in code to refer to modern SDP location for password files and to use /p4/common/site/automerge as the home directory, following the modern SDP covention using the 'site' directory. * Fixed a broken link to the long-gone blog article "Living on the Edge - Automatic Merging" by adding the article in the new 'docs' folder (adding the original Word doc and converting to HTML). No functional changes. |
||