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/da8363fe Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/da8363fe Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/da8363fe Branch: refs/heads/master Commit: da8363fe62c490e6ec669e57ba19e9a49a9ddbcb Parents: 3c0cd64 73a37a4 Author: tballison <[email protected]> Authored: Thu Feb 2 11:09:56 2017 -0500 Committer: tballison <[email protected]> Committed: Thu Feb 2 11:09:56 2017 -0500 ---------------------------------------------------------------------- .../org/apache/tika/mime/tika-mimetypes.xml | 10 ++++++ .../org/apache/tika/mime/TestMimeTypes.java | 17 ++++++++++ .../test/resources/test-documents/testSAS.sas | 33 +++++++++++++++++++ .../resources/test-documents/testSAS.sas7bdat | Bin 0 -> 17408 bytes .../test/resources/test-documents/testSAS.sd2 | Bin 0 -> 16640 bytes .../test/resources/test-documents/testSAS.xpt | Bin 0 -> 3360 bytes tika-server/pom.xml | 19 +++++++---- 7 files changed, 73 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
