Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/01109c8f Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/01109c8f Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/01109c8f Branch: refs/heads/master Commit: 01109c8fec3a736749b9cd2dd741fbcc936cbf4c Parents: 34db935 c94236a Author: tballison <[email protected]> Authored: Thu Mar 31 11:53:28 2016 -0400 Committer: tballison <[email protected]> Committed: Thu Mar 31 11:53:28 2016 -0400 ---------------------------------------------------------------------- .../org/apache/tika/mime/tika-mimetypes.xml | 15 +++++++-------- .../java/org/apache/tika/mime/TestMimeTypes.java | 6 ++++++ .../src/test/resources/test-documents/testMIF.mif | Bin 0 -> 10240 bytes 3 files changed, 13 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
