Merge branch 'master' into new-website

# Conflicts:
#	index.html
This commit is contained in:
John J. Camilleri committed 2018-11-28 14:47:20 +01:00
commit 6352799ccb
357 files changed
+50 -29780

No files matched your search

+1 -2
View File
@@ -39,10 +39,9 @@ src/runtime/c/sg/.dirstamp
src/runtime/c/stamp-h1
src/runtime/java/.libs/
src/runtime/python/build/
src/ui/android/libs/
src/ui/android/obj/
.cabal-sandbox
cabal.sandbox.config
.stack-work
DATA_DIR
# Generated documentation (not exhaustive)