Merge branch 'master' of https://gitbox.apache.org/repos/asf/ant-antlibs-dotnet master
authorjkf <jm@famkruithof.net>
Sun, 26 May 2019 20:52:33 +0000 (22:52 +0200)
committerjkf <jm@famkruithof.net>
Sun, 26 May 2019 20:52:33 +0000 (22:52 +0200)
1  2 
docs/dotnetexec.html
docs/index.html
docs/nant.html
docs/nunit.html
docs/old-core.html
docs/tallow.html
docs/wix.html
prepare.xml
src/main/org/apache/ant/dotnet/NUnitTask.java
src/main/org/apache/ant/dotnet/wix/TallowTask.java
src/main/org/apache/ant/dotnet/wix/WixTask.java

Simple merge
diff --cc docs/index.html
Simple merge
diff --cc docs/nant.html
Simple merge
diff --cc docs/nunit.html
Simple merge
Simple merge
Simple merge
diff --cc docs/wix.html
Simple merge
diff --cc prepare.xml
Simple merge