# HG changeset patch
# User cavaliet
# Date 1396442188 -7200
# Node ID c5dae4b8caa246cac925e22b5779aa5be66d3e52
# Parent  d48100e2feadf493b375b3ee21bea41e3bdaf05f# Parent  7905808a7961c70fa1225954fffe9a01b49c485f
merge

diff -r d48100e2fead -r c5dae4b8caa2 .buildpath
--- a/.buildpath	Wed Apr 02 14:35:16 2014 +0200
+++ b/.buildpath	Wed Apr 02 14:36:28 2014 +0200
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   This file is part of the WikiTagBundle package.
 
@@ -6,7 +7,6 @@
   For the full copyright and license information, please view the LICENSE
   file that was distributed with this source code.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <buildpath>
 	<buildpathentry kind="src" path=""/>
 	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
diff -r d48100e2fead -r c5dae4b8caa2 .hgtags
--- a/.hgtags	Wed Apr 02 14:35:16 2014 +0200
+++ b/.hgtags	Wed Apr 02 14:36:28 2014 +0200
@@ -15,3 +15,4 @@
 3e11915dd103414e0380d9f56cfdb59842485e7c V00.11
 a22fb91de2311d184e158becd71fe94c384253ba V00.12
 2f45e6bafb9529fa9e3a81b67ec2358eb15cecf0 V00.13
+3510cf636720ba20ae5b94b14f3a4360d09c9740 V00.14
diff -r d48100e2fead -r c5dae4b8caa2 .project
--- a/.project	Wed Apr 02 14:35:16 2014 +0200
+++ b/.project	Wed Apr 02 14:36:28 2014 +0200
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   This file is part of the WikiTagBundle package.
 
@@ -6,7 +7,6 @@
   For the full copyright and license information, please view the LICENSE
   file that was distributed with this source code.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>wikitag</name>
 	<comment></comment>