diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2015-12-04 13:50:40 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2015-12-04 13:50:40 +0300 |
| commit | 0967f73f0f2ae8180424a145bf27ae6760c2f045 (patch) | |
| tree | 2c833ec2d09392721d52a0ebe0b6f0ebdbb1f6f8 /Makefile | |
| parent | 40f79caeff9e278d42f62e567cc00ee45bfee87d (diff) | |
| parent | d555a76d7ff7a9359286a17e2873056f61ae5edd (diff) | |
Merge branch 'master' into roslyn
Conflicts:
main/src/addins/NUnit/Gui/AbstractUnitTestEditorExtension.cs
version-checks
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ include main/monodevelop_version -EXTRA_DIST = configure +EXTRA_DIST = configure code_of_conduct.md SPACE := SPACE += AOT_DIRECTORIES:=$(subst $(SPACE),:,$(shell find main/build/* -type d)) |