Merge to trunk everything in img_metadata branch.
authorBrian Wolff <bawolff@users.mediawiki.org>
Sat, 16 Apr 2011 01:23:15 +0000 (01:23 +0000)
committerBrian Wolff <bawolff@users.mediawiki.org>
Sat, 16 Apr 2011 01:23:15 +0000 (01:23 +0000)
commit74f16767e77167430c357ffb198b02abdffd8ad2
treec0fb4f64642906278890a9665f466f2c1132b966
parent700d35ed29c4b5e3aed265894ae40ae0a10d2bbf
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.
38 files changed:
docs/hooks.txt
includes/AutoLoader.php
includes/DefaultSettings.php
includes/Exif.php [deleted file]
includes/ImagePage.php
includes/api/ApiQueryImageInfo.php
includes/filerepo/File.php
includes/filerepo/ForeignAPIFile.php
includes/filerepo/LocalFile.php
includes/media/Bitmap.php
includes/media/BitmapMetadataHandler.php [new file with mode: 0644]
includes/media/Exif.php [new file with mode: 0644]
includes/media/FormatMetadata.php [new file with mode: 0644]
includes/media/GIF.php
includes/media/GIFMetadataExtractor.php
includes/media/Generic.php
includes/media/IPTC.php [new file with mode: 0644]
includes/media/Jpeg.php [new file with mode: 0644]
includes/media/JpegMetadataExtractor.php [new file with mode: 0644]
includes/media/PNG.php
includes/media/PNGMetadataExtractor.php
includes/media/XMP.php [new file with mode: 0644]
includes/media/XMPInfo.php [new file with mode: 0644]
includes/media/XMPValidate.php [new file with mode: 0644]
languages/messages/MessagesEn.php
languages/messages/MessagesFr.php
languages/messages/MessagesFrp.php
languages/messages/MessagesIt.php
languages/messages/MessagesJa.php
languages/messages/MessagesNl.php
languages/messages/MessagesOc.php
languages/messages/MessagesPms.php
languages/messages/MessagesQqq.php
languages/messages/MessagesScn.php
maintenance/language/messageTypes.inc
maintenance/language/messages.inc
maintenance/rebuildImages.php
skins/common/shared.css