From 3dca69859a8f1609dce0fe39c637046972476c45 Mon Sep 17 00:00:00 2001
From: Sebastian Fischer <typo3@evoweb.de>
Date: Thu, 28 Jan 2016 07:32:19 +0100
Subject: [PATCH] PS-144.3168 <sebastian@helium Update ignore.xml,
 filetypes.xml, databaseDrivers.xml

---
 databaseDrivers.xml |  2 +-
 filetypes.xml       |  6 +++---
 ignore.xml          | 30 +++++++++++++++---------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/databaseDrivers.xml b/databaseDrivers.xml
index c1b7181..a2813e0 100644
--- a/databaseDrivers.xml
+++ b/databaseDrivers.xml
@@ -55,7 +55,7 @@
         <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/mysql-connector-license.txt</url>
       </library>
       <library>
-        <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/mysql-connector-java-5.1.29-bin.jar</url>
+        <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/mysql-connector-java-5.1.35-bin.jar</url>
       </library>
     </driver>
     <driver id="hsqldb.remote" name="HSQLDB (Remote)" dialect="HSQLDB">
diff --git a/filetypes.xml b/filetypes.xml
index 944c3db..74ae3ea 100644
--- a/filetypes.xml
+++ b/filetypes.xml
@@ -5,15 +5,15 @@
       <mapping ext="sxw" type="Native" />
       <mapping ext="phps" type="PHP" />
       <mapping pattern="temp" type="PLAIN_TEXT" />
-      <mapping pattern="live_export_snapshot_markerfile" type="PLAIN_TEXT" />
-      <mapping pattern="ENABLE_INSTALL_TOOL" type="PLAIN_TEXT" />
       <mapping pattern="README" type="PLAIN_TEXT" />
       <mapping pattern="DEV" type="PLAIN_TEXT" />
       <mapping pattern="Changelog" type="PLAIN_TEXT" />
       <mapping pattern="1" type="PLAIN_TEXT" />
-      <mapping pattern="ChangeLog" type="PLAIN_TEXT" />
       <mapping pattern="mfc_productimport_ERRobj" type="PLAIN_TEXT" />
+      <mapping pattern="ChangeLog" type="PLAIN_TEXT" />
       <mapping pattern="Credits" type="PLAIN_TEXT" />
+      <mapping pattern="live_export_snapshot_markerfile" type="PLAIN_TEXT" />
+      <mapping pattern="ENABLE_INSTALL_TOOL" type="PLAIN_TEXT" />
       <mapping ext="csv" type="PLAIN_TEXT" />
       <mapping ext="svn" type="PLAIN_TEXT" />
       <mapping ext="tmpl" type="PLAIN_TEXT" />
diff --git a/ignore.xml b/ignore.xml
index 55b93e0..0a505ab 100644
--- a/ignore.xml
+++ b/ignore.xml
@@ -1,21 +1,21 @@
 <application>
   <component name="IgnoreSettings" missingGitignore="true" ignoredFileStatus="true" outerIgnoreRules="true" settingsFixed="true">
     <languages>
-      <language id="Bazaar" ENABLE="true" NEW_FILE="true" />
-      <language id="Chef" ENABLE="false" NEW_FILE="true" />
-      <language id="Cvs" ENABLE="true" NEW_FILE="true" />
-      <language id="Darcs" ENABLE="true" NEW_FILE="true" />
-      <language id="Docker" ENABLE="false" NEW_FILE="true" />
-      <language id="Floobits" ENABLE="false" NEW_FILE="true" />
-      <language id="Fossil" ENABLE="true" NEW_FILE="true" />
-      <language id="Git" ENABLE="true" NEW_FILE="true" />
-      <language id="JSHint" ENABLE="false" NEW_FILE="true" />
-      <language id="Mercurial" ENABLE="true" NEW_FILE="true" />
-      <language id="Monotone" ENABLE="true" NEW_FILE="true" />
-      <language id="Nodemon" ENABLE="false" NEW_FILE="true" />
-      <language id="Npm" ENABLE="false" NEW_FILE="true" />
-      <language id="Perforce" ENABLE="true" NEW_FILE="true" />
-      <language id="Team Foundation" ENABLE="true" NEW_FILE="true" />
+      <language id="Bazaar" NEW_FILE="true" ENABLE="true" />
+      <language id="Chef" NEW_FILE="true" ENABLE="false" />
+      <language id="Cvs" NEW_FILE="true" ENABLE="true" />
+      <language id="Darcs" NEW_FILE="true" ENABLE="true" />
+      <language id="Docker" NEW_FILE="true" ENABLE="false" />
+      <language id="Floobits" NEW_FILE="true" ENABLE="false" />
+      <language id="Fossil" NEW_FILE="true" ENABLE="true" />
+      <language id="Git" NEW_FILE="true" ENABLE="true" />
+      <language id="JSHint" NEW_FILE="true" ENABLE="false" />
+      <language id="Mercurial" NEW_FILE="true" ENABLE="true" />
+      <language id="Monotone" NEW_FILE="true" ENABLE="true" />
+      <language id="Nodemon" NEW_FILE="true" ENABLE="false" />
+      <language id="Npm" NEW_FILE="true" ENABLE="false" />
+      <language id="Perforce" NEW_FILE="true" ENABLE="true" />
+      <language id="Team Foundation" NEW_FILE="true" ENABLE="true" />
     </languages>
     <userTemplates />
   </component>