You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/07/26 19:28:35 UTC
[4/4] tika git commit: Merge remote-tracking branch 'origin/master'
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/f5b04b60
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/f5b04b60
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/f5b04b60
Branch: refs/heads/master
Commit: f5b04b60c472062ab46a0a19eb75d3a39e80fc76
Parents: 7dc5c67 53c461a
Author: tballison <ta...@mitre.org>
Authored: Tue Jul 26 15:28:28 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Tue Jul 26 15:28:28 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/tika/mime/tika-mimetypes.xml | 15 ++++++++++++++-
.../java/org/apache/tika/mime/TestMimeTypes.java | 3 +++
3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/f5b04b60/CHANGES.txt
----------------------------------------------------------------------