Merge branch 'master' of https://git.fortiss.org/af3/af3.git into 3712

com.microsoft.z3/META-INF/MANIFEST.MF

@@ -14,7 +14,7 @@ Bundle-Activator: com.microsoft.z3.AF3z3Activator
 Bundle-NativeCode: lib/x64/libz3.so ; lib/x64/libz3java.so ; osname = linux ; processor = x86_64,
  lib/x64/libz3.dll ; lib/x64/libz3java.dll ; osname = win32 ; osname = "Windows 10"; osname = "Windows 7" ; osname = Windows7 ; osname = Win7 ; osname = "Windows 8" ; osname = Windows8 ; osname = Win8 ; osname = "Windows 8.1" ; osname = Windows8.1 ; osname = Win8.1 ; processor = x86_64,
  lib/x64/libz3.dylib ; lib/x64/libz3java.dylib ; osname = macosx ; processor = x86_64,
- lib/x32/libz3.dll ; lib/x32/libz3java.dll ; lib/x32/msvcp140.dll ; lib/x32/vcomp140.dll ; lib/x32/Microsoft.Z3.dll ; osname = win32 ; osname = Windows 7 ; osname = Windows7 ; osname = Win7 ; processor = x86
+ lib/x32/libz3.dll ; lib/x32/libz3java.dll ; lib/x32/msvcp120.dll ; lib/x32/msvcr120.dll ; lib/x32/vcomp120.dll ; lib/x32/Microsoft.Z3.dll ; osname = win32 ; osname = Windows 7 ; osname = Windows7 ; osname = Win7 ; processor = x86
 Export-Package: com.microsoft.z3,
  com.microsoft.z3.enumerations
 Eclipse-BundleShape: dir

com.microsoft.z3/src/com/microsoft/z3/.ratings

-AF3z3Activator.java 9086ea9b6989cafac4a32835b953fd0c2ac31c6b GREEN
+AF3z3Activator.java 3b41854f824afc76c3f804e627ca24dc438df758 YELLOW
 Z3Type.java 73e319ae206d2fd456ec9430c01b5ff7fc7282d0 GREEN
 Z3javaAPIWrapper.java d21fa89f50dd9afe49eaad0901384bdf99df548f GREEN

com.microsoft.z3/src/com/microsoft/z3/AF3z3Activator.java

@@ -42,8 +42,9 @@ public class AF3z3Activator extends Plugin {
 
 			// Load additional libraries needed on Windows
 			loadPluginLocalLibrary(getBundle(), path, "Microsoft.Z3", "libz3");
-			loadPluginLocalLibrary(getBundle(), path, "msvcp140", "libz3");
-			loadPluginLocalLibrary(getBundle(), path, "vcomp140", "libz3");
+			loadPluginLocalLibrary(getBundle(), path, "msvcp120", "libz3");
+			loadPluginLocalLibrary(getBundle(), path, "msvcr120", "libz3");
+			loadPluginLocalLibrary(getBundle(), path, "vcomp120", "libz3");
 		} else if(!isOs64BitArch()) {
 			System.out.println("[Z3] Warning: 32 bit support is only on Windows.");
 		}