Viewing all changes in revision 5162.3.1.

Committer: Aaron Bentley
Date: 2010-04-24 00:29:12 UTC
mto: This revision was merged to the branch mainline in revision 5186 .
Revision ID: aaron@aaronbentley.com-20100424002912-np8lkz9u1l9a9mxq

Fix switch/merge when a ConfigurableFileMerger is used.

added added

removed removed