Merge to trunk everything in img_metadata branch.
rSVN86169
Actions

Description

Merge to trunk everything in img_metadata branch.

Hope I did this in an ok fashion. svn merge --re-integrate was giving me issues
so I just essentially over-wrote my working copy with the version at img_metadata.

Merge to trunk everything in img_metadata branch.rSVN86169Actions

Description

Details

Event Timeline

Changes (38)

rSVN86169

trunk/phase3/docs/hooks.txt

trunk/phase3/includes/AutoLoader.php

trunk/phase3/includes/DefaultSettings.php

trunk/phase3/includes/Exif.php

trunk/phase3/includes/ImagePage.php

trunk/phase3/includes/api/ApiQueryImageInfo.php

trunk/phase3/includes/filerepo/File.php

trunk/phase3/includes/filerepo/ForeignAPIFile.php

trunk/phase3/includes/filerepo/LocalFile.php

trunk/phase3/includes/media/Bitmap.php

trunk/phase3/includes/media/BitmapMetadataHandler.php

trunk/phase3/includes/media/Exif.php

trunk/phase3/includes/media/FormatMetadata.php

trunk/phase3/includes/media/GIF.php

trunk/phase3/includes/media/GIFMetadataExtractor.php

trunk/phase3/includes/media/Generic.php

trunk/phase3/includes/media/IPTC.php

trunk/phase3/includes/media/Jpeg.php

trunk/phase3/includes/media/JpegMetadataExtractor.php

trunk/phase3/includes/media/PNG.php

trunk/phase3/includes/media/PNGMetadataExtractor.php

trunk/phase3/includes/media/XMP.php

trunk/phase3/includes/media/XMPInfo.php

trunk/phase3/includes/media/XMPValidate.php

trunk/phase3/languages/messages/MessagesEn.php

trunk/phase3/languages/messages/MessagesFr.php

trunk/phase3/languages/messages/MessagesFrp.php

trunk/phase3/languages/messages/MessagesIt.php

trunk/phase3/languages/messages/MessagesJa.php

trunk/phase3/languages/messages/MessagesNl.php

trunk/phase3/languages/messages/MessagesOc.php

trunk/phase3/languages/messages/MessagesPms.php

trunk/phase3/languages/messages/MessagesQqq.php

trunk/phase3/languages/messages/MessagesScn.php

trunk/phase3/maintenance/language/messageTypes.inc

trunk/phase3/maintenance/language/messages.inc

trunk/phase3/maintenance/rebuildImages.php

trunk/phase3/skins/common/shared.css

Merge to trunk everything in img_metadata branch.
rSVN86169
Actions