================================================================================
 This file records the status of the ongoing diff of 6.0.x against trunk. The
 purpose of the diff is to ensure that:
  - all the changes to 6.0.x have also been made to trunk
  - all appropriate changes from trunk are ported to 6.0.x
  - the trunk change log is complete

 As the diff progresses, all of the differences between 6.0.x and trunk will be
 one of the following:
  - merged into trunk/6.0.x as appropriate to eliminate the difference
  - proposed for merge into 6.0.x
  - added to the trunk change log
================================================================================

TODO
====
/bin
/conf
/java
/native
/res
/test
/webapps

Note that larger directory structures, like java, will be broken down into
smaller, more manageable chunks.

In progress
===========
/        - markt


Complete
========
None


Issues
======
None
Add temp file to track diff status
Add temp file to track diff status

git-svn-id: 79cef5a5a257cc9dbe40a45ac190115b4780e2d0@714253 13f79535-47bb-0310-9956-ffa450edef68
