<?xml version="1.0" encoding="UTF-8" ?> <!--perforce-xml-version=1.0--> <PropertyList varName="Settings"> <Associations varName="Merge Associations"> <RunExternal>false</RunExternal> <Association varName="Default Association"> <Application>C:/Program Files/Araxis/Araxis Merge/AraxisP4WinMrg.exe</Application> <Arguments>%b %1 %2 %r</Arguments> </Association> </Associations> <Associations varName="Diff Associations"> <PropertyList varName="Associations"> <Association varName="doc"> <Application>c:/program files/perforce/p4worddiff.exe</Application> <Arguments>%1 %2</Arguments> </Association> <Association varName="docx"> <Application>c:/program files/perforce/p4worddiff.exe</Application> <Arguments>%1 %2</Arguments> </Association> </PropertyList> </Associations> </PropertyList>
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 24981 | kyo_siye | "Forking branch main of robert-cowham-p4officediff to kyo_siye-p4officediff." | ||
//guest/robert_cowham/perforce/p4officediff/main/test/good_appsettings3.xml | |||||
#1 | 11846 | Robert Cowham | Rename P4WordDiff to P4OfficeDiff - start of process | ||
//guest/robert_cowham/p4worddiff/main/test/good_appsettings3.xml | |||||
#1 | 11587 | Robert Cowham |
Initial project from internal sources. Needs updating (fgorm 2008 technology)! |