Merge branch 'master' of https://opensourceprojects.eu/git/p/recoll1/code

2018-10-12 12:06:21 +02:00
parent f737a6c584 8a09948745
commit beebb1028b
151 changed files with 10323 additions and 3194 deletions
@@ -80,6 +80,8 @@ application/vnd.sun.xml.writer.global = execm python rclsoff.py
 application/vnd.sun.xml.writer.template = execm python rclsoff.py

 application/vnd.wordperfect = exec wpd/wpd2html;mimetype=text/html
+application/x-abiword = execm python rclabw.py
+text/x-fictionbook = execm python rclfb2.py

 application/vnd.openxmlformats-officedocument.wordprocessingml.document = \
 execm python rclopxml.py