Paul Chaignon ae2d3d7e61 Merge conflicts from master fixed

2014-06-19 18:45:56 +02:00

..

filenames

Sample files to test the new FileBlob.extension method

2014-06-19 18:34:37 +02:00

csproj-sample.csproj

Add samples as requested.

2014-05-05 08:10:49 +03:00

fsproj-sample.fsproj

Add samples as requested.

2014-05-05 08:10:49 +03:00

module.ant

…

module.ivy

…

net_docfile.xml

…

nproj-sample.nproj

Add samples as requested.

2014-05-05 08:10:49 +03:00

pt_BR.xml

…

sample.nuspec

Add .nuspec sample

2014-06-19 07:53:52 -07:00

sample.targets

Add targets sample.

2014-05-07 20:47:09 +03:00

vbproj-sample.vbproj

Add samples as requested.

2014-05-05 08:10:49 +03:00

vcxproj-sample.vcxproj

Add samples as requested.

2014-05-05 08:10:49 +03:00

vcxproj-sample.vcxproj.filters

Add samples as requested.

2014-05-05 08:10:49 +03:00

XmlIO.pluginspec

…