Fix conflicts from merging master into 'mod-extension'

This commit is contained in:
Paul Chaignon
2015-07-04 18:01:56 +02:00
130 changed files with 24053 additions and 160 deletions

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<PolicySet name="Example.mdpolicy">
<TextStylePolicy inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/x-csharp">
<FileWidth>120</FileWidth>
<TabsToSpaces>False</TabsToSpaces>
<NoTabsAfterNonTabs>True</NoTabsAfterNonTabs>
</TextStylePolicy>
<DotNetNamingPolicy>
<DirectoryNamespaceAssociation>None</DirectoryNamespaceAssociation>
<ResourceNamePolicy>FileFormatDefault</ResourceNamePolicy>
</DotNetNamingPolicy>
</PolicySet>

13
samples/XML/intellij.iml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="backend node_modules" level="project" />
</component>
</module>

View File

@@ -0,0 +1,4 @@
<?xml version="1.0"?>
<gml:Point xmlns:gml="http://www.opengis.net/gml" srsName="urn:ogc:def:crs:EPSG::4326" gml:id="uuid.12b3c8bb-bc8a-4f83-9085-1a5f3280b8ba">
<gml:pos>52.56 13.29</gml:pos>
</gml:Point>

View File

@@ -0,0 +1,4 @@
<?xml version="1.0"?>
<gml:Point xmlns:gml="http://www.opengis.net/gml/3.2" srsName="urn:ogc:def:crs:EPSG::4326" gml:id="uuid.12b3c8bb-bc8a-4f83-9085-1a5f3280b8ba">
<gml:pos>52.56 13.29</gml:pos>
</gml:Point>