Merge branch 'TIKA-1877' of https://github.com/prasadns14/tika
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/e1050887 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/e1050887 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/e1050887 Branch: refs/heads/master Commit: e105088729ef12acbda1fe4e71f462f84d98f981 Parents: 355a7d1 602d237 Author: Nick Burch <[email protected]> Authored: Sun Mar 6 12:24:35 2016 +0000 Committer: Nick Burch <[email protected]> Committed: Sun Mar 6 12:24:35 2016 +0000 ---------------------------------------------------------------------- .../src/main/resources/org/apache/tika/mime/tika-mimetypes.xml | 1 + tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java | 1 + ...4E8D6B46E2366D7063DE3926AF0F976A0DCCD57A7E3B53B7D54768F16DD23984 | 1 + 3 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/e1050887/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/e1050887/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java ----------------------------------------------------------------------
