Paul Chaignon 8c54f68040 Fix conflicts from merging master into 'mod-extension'

2015-07-04 18:01:56 +02:00

..

filenames

…

Application.xib

…

csproj-sample.csproj

…

Example.mdpolicy

add .mdpolicy XML files

2015-05-23 21:32:17 +02:00

fsproj-sample.fsproj

…

FXMLSample.fxml

…

intellij.iml

Display IntelliJ configurations files as XML

2015-05-20 14:18:01 +02:00

libsomething.dll.config

…

module.ant

…

module.ivy

…

net_docfile.xml

…

nproj-sample.nproj

…

phpunit.xml.dist

…

point-3.1.gml

Add languages.yml entry and sample files for OGC Geography Markup Language (#2366)

2015-05-03 19:15:54 +02:00

point-3.2.gml

Add languages.yml entry and sample files for OGC Geography Markup Language (#2366)

2015-05-03 19:15:54 +02:00

pt_BR.ts

…

pt_BR.xml

…

sample.nuspec

…

sample.targets

…

some-ideas.mm

…

Storyboard.storyboard

…

tei-odd-sample.odd

Move .odd file to the right directory

2015-04-15 18:37:36 -07:00

vbproj-sample.vbproj

…

vcxproj-sample.vcxproj

…

vcxproj-sample.vcxproj.filters

…

xhtml-struct-1.mod

.mod file extension for AMPL, Linux Kernel Module, Modula-2 and XML

2015-04-19 12:39:21 +02:00

XmlIO.pluginspec

…