Merge branch 'master.upstream' into staging.upstream

2015-07-13 15:11:31 -07:00
parent d253b3d875 7e3c95a0b8
commit 333f145d76
178 changed files with 2917 additions and 1932 deletions
@@ -1,11 +0,0 @@
--- file-5.11/python/magic.py	2011-09-22 18:57:41.000000000 +0200
-+++ file-5.11/python/magic.py.1	2012-04-30 15:00:31.750213810 +0200
-@@ -13,7 +13,7 @@
-     Loads the shared library through ctypes and returns a library
-     L{ctypes.CDLL} instance 
-     """
-    return ctypes.cdll.LoadLibrary(find_library('magic'))
-+    return ctypes.CDLL('libmagic.so')
- 
- _libraries = {}
- _libraries['magic'] = _init()