48b3b82410
# Conflicts: # builds/Makefile # external/mono |
||
---|---|---|
.. | ||
.gitignore | ||
mono.mk | ||
quiet.mk | ||
rules.mk | ||
subdirs.mk | ||
versions.mk | ||
xamarin-reset.sh | ||
xamarin.mk |
48b3b82410
# Conflicts: # builds/Makefile # external/mono |
||
---|---|---|
.. | ||
.gitignore | ||
mono.mk | ||
quiet.mk | ||
rules.mk | ||
subdirs.mk | ||
versions.mk | ||
xamarin-reset.sh | ||
xamarin.mk |