| Property changes on: branches/uploadwizard/phase3/api.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/api.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/profileinfo.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/phase3/profileinfo.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/thumb.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/phase3/thumb.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/config |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 4 | 4 | Merged /trunk/phase3/config:r74034 |
| Property changes on: branches/uploadwizard/phase3/load.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5 | 5 | Merged /trunk/phase3/load.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/RELEASE-NOTES |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 6 | 6 | Merged /trunk/phase3/RELEASE-NOTES:r74034 |
| Property changes on: branches/uploadwizard/phase3/languages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 7 | 7 | Merged /trunk/phase3/languages:r74034 |
| Property changes on: branches/uploadwizard/phase3/FAQ |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 8 | 8 | Merged /trunk/phase3/FAQ:r74034 |
| Property changes on: branches/uploadwizard/phase3/resources |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /trunk/phase3/resources:r74034 |
| Property changes on: branches/uploadwizard/phase3/StartProfiler.sample |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 10 | 10 | Merged /trunk/phase3/StartProfiler.sample:r74034 |
| Property changes on: branches/uploadwizard/phase3/maintenance/archives |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 11 | Merged /trunk/phase3/maintenance/archives:r74034 |
| Property changes on: branches/uploadwizard/phase3/maintenance/tables.sql |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 12 | 12 | Merged /trunk/phase3/maintenance/tables.sql:r74034 |
| Property changes on: branches/uploadwizard/phase3/maintenance/tests |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 13 | 13 | Merged /trunk/phase3/maintenance/tests:r74034 |
| Property changes on: branches/uploadwizard/phase3/maintenance/cleanupTable.inc |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 14 | 14 | Merged /trunk/phase3/maintenance/cleanupTable.inc:r74034 |
| Property changes on: branches/uploadwizard/phase3/maintenance/deleteSelfExternals.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 15 | 15 | Merged /trunk/phase3/maintenance/deleteSelfExternals.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/maintenance/populateRevisionLength.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 16 | 16 | Merged /trunk/phase3/maintenance/populateRevisionLength.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/maintenance |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 17 | 17 | Merged /trunk/phase3/maintenance:r74034 |
| Property changes on: branches/uploadwizard/phase3/php5.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18 | 18 | Merged /trunk/phase3/php5.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/UPGRADE |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 19 | 19 | Merged /trunk/phase3/UPGRADE:r74034 |
| Property changes on: branches/uploadwizard/phase3/skins |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 20 | 20 | Merged /trunk/phase3/skins:r74034 |
| Property changes on: branches/uploadwizard/phase3/docs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 21 | 21 | Merged /trunk/phase3/docs:r74034 |
| Property changes on: branches/uploadwizard/phase3/math |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 22 | 22 | Merged /trunk/phase3/math:r74034 |
| Property changes on: branches/uploadwizard/phase3/CREDITS |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 23 | 23 | Merged /trunk/phase3/CREDITS:r74034 |
| Property changes on: branches/uploadwizard/phase3/opensearch_desc.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 24 | 24 | Merged /trunk/phase3/opensearch_desc.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/trackback.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 25 | 25 | Merged /trunk/phase3/trackback.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/HISTORY |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 26 | 26 | Merged /trunk/phase3/HISTORY:r74034 |
| Property changes on: branches/uploadwizard/phase3/cache |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 27 | 27 | Merged /trunk/phase3/cache:r74034 |
| Property changes on: branches/uploadwizard/phase3/images |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 28 | 28 | Merged /trunk/phase3/images:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/Interwiki.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 29 | 29 | Merged /trunk/phase3/includes/Interwiki.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 30 | 30 | Merged /trunk/phase3/includes/json/Services_JSON.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/GlobalFunctions.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 31 | 31 | Merged /trunk/phase3/includes/GlobalFunctions.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 32 | 32 | Merged /trunk/phase3/includes/OutputPage.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 33 | 33 | Merged /trunk/phase3/includes/HistoryPage.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/installer/DatabaseInstaller.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 34 | 34 | Merged /trunk/phase3/includes/installer/DatabaseInstaller.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/ResourceLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 35 | 35 | Merged /trunk/phase3/includes/ResourceLoader.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 36 | 36 | Merged /trunk/phase3/includes/api:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/ChangesList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 37 | 37 | Merged /trunk/phase3/includes/ChangesList.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 38 | 38 | Merged /trunk/phase3/includes/ConfEditor.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 39 | 39 | Merged /trunk/phase3/includes/specials:r74034 |
| Property changes on: branches/uploadwizard/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 40 | 40 | Merged /trunk/phase3/includes:r74034 |
| Property changes on: branches/uploadwizard/phase3/INSTALL |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 41 | 41 | Merged /trunk/phase3/INSTALL:r74034 |
| Property changes on: branches/uploadwizard/phase3/img_auth.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 42 | 42 | Merged /trunk/phase3/img_auth.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/COPYING |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 43 | 43 | Merged /trunk/phase3/COPYING:r74034 |
| Property changes on: branches/uploadwizard/phase3/bin |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 44 | 44 | Merged /trunk/phase3/bin:r74034 |
| Property changes on: branches/uploadwizard/phase3/opensearch_desc.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 45 | 45 | Merged /trunk/phase3/opensearch_desc.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/trackback.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 46 | 46 | Merged /trunk/phase3/trackback.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/redirect.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 47 | 47 | Merged /trunk/phase3/redirect.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/index.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 48 | 48 | Merged /trunk/phase3/index.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/img_auth.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 49 | 49 | Merged /trunk/phase3/img_auth.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/redirect.phtml |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 50 | 50 | Merged /trunk/phase3/redirect.phtml:r74034 |
| Property changes on: branches/uploadwizard/phase3/api.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 51 | 51 | Merged /trunk/phase3/api.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/wiki.phtml |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 52 | 52 | Merged /trunk/phase3/wiki.phtml:r74034 |
| Property changes on: branches/uploadwizard/phase3/redirect.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 53 | 53 | Merged /trunk/phase3/redirect.php:r74034 |
| Property changes on: branches/uploadwizard/phase3/thumb.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 54 | 54 | Merged /trunk/phase3/thumb.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/load.php5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 55 | 55 | Merged /trunk/phase3/load.php5:r74034 |
| Property changes on: branches/uploadwizard/phase3/serialized |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 56 | 56 | Merged /trunk/phase3/serialized:r74034 |
| Property changes on: branches/uploadwizard/phase3/README |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 57 | 57 | Merged /trunk/phase3/README:r74034 |
| Property changes on: branches/uploadwizard/phase3/index.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 58 | 58 | Merged /trunk/phase3/index.php:r74034 |
| Property changes on: branches/uploadwizard/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 59 | 59 | Merged /trunk/phase3:r74034* |
| Property changes on: branches/uploadwizard/extensions/ContactPageFundraiser |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 60 | 60 | Merged /trunk/phase3/extensions/ContactPageFundraiser:r74034 |
| Property changes on: branches/uploadwizard/extensions/LocalisationUpdate |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 61 | 61 | Merged /trunk/phase3/extensions/LocalisationUpdate:r74034 |
| Property changes on: branches/uploadwizard/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 62 | 62 | Merged /trunk/phase3/extensions:r74034 |