| Property changes on: branches/iwtransclusion/phase3/maintenance/deleteSelfExternals.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/maintenance/deleteSelfExternals.php:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/maintenance/tests |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/phase3/maintenance/tests:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/maintenance/populateRevisionLength.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/phase3/maintenance/populateRevisionLength.php:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/maintenance/cleanupTable.inc |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 4 | 4 | Merged /trunk/phase3/maintenance/cleanupTable.inc:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/maintenance/tables.sql |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5 | 5 | Merged /branches/sqlite/maintenance/tables.sql:r58211-58321 |
| 6 | 6 | Merged /trunk/phase3/maintenance/tables.sql:r67506-73220 |
| 7 | 7 | Merged /branches/new-installer/phase3/maintenance/tables.sql:r43664-66004 |
| 8 | 8 | Merged /branches/REL1_15/phase3/maintenance/tables.sql:r51646 |
| Property changes on: branches/iwtransclusion/phase3/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /trunk/phase3/includes/json/Services_JSON.php:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes/GlobalFunctions.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 10 | 10 | Merged /trunk/phase3/includes/GlobalFunctions.php:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 11 | Merged /trunk/phase3/includes/OutputPage.php:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 12 | 12 | Merged /trunk/phase3/includes/HistoryPage.php:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes/installer/DatabaseInstaller.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 13 | 13 | Merged /trunk/phase3/includes/installer/DatabaseInstaller.php:r67506-68448,73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 14 | 14 | Merged /trunk/phase3/includes/api:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes/ChangesList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 15 | 15 | Merged /trunk/phase3/includes/ChangesList.php:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 16 | 16 | Merged /trunk/phase3/includes/ConfEditor.php:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 17 | 17 | Merged /trunk/phase3/includes/specials:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18 | 18 | Merged /trunk/phase3/includes:r73217-73220 |
| Property changes on: branches/iwtransclusion/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 19 | 19 | Merged /trunk/phase3:r73217-73220 |