U    packages/fcl-registry/src/winreg.inc
A    tests/test/packages/fcl-registry/tw35060a.pp
A    tests/test/packages/fcl-registry/tw35060b.pp
--- Recording mergeinfo for merge of r41325 into '.':
 U   .
--- Merging r41352 into '.':
G    packages/fcl-registry/src/winreg.inc
--- Recording mergeinfo for merge of r41352 into '.':
 G   .
--- Merging r41415 into '.':
U    packages/fcl-registry/src/registry.pp
U    tests/test/packages/fcl-registry/tw35060a.pp
U    tests/test/packages/fcl-registry/tw35060b.pp
A    tests/test/packages/fcl-registry/tw35060c.pp
--- Recording mergeinfo for merge of r41415 into '.':
 G   .
--- Merging r41784 into '.':
U    packages/fcl-registry/src/regdef.inc
G    packages/fcl-registry/src/registry.pp
G    packages/fcl-registry/src/winreg.inc
U    packages/fcl-registry/src/xmlreg.pp
U    packages/fcl-registry/src/xregreg.inc
--- Recording mergeinfo for merge of r41784 into '.':
 G   .
--- Merging r41785 into '.':
A    packages/fcl-registry/examples/testunicode2.pp
--- Recording mergeinfo for merge of r41785 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43903 -