Merge branch 'master' into smarter-imports

# Conflicts:
#	src/module/io.c
#	src/vm/wren_vm.c
This commit is contained in:
Bob Nystrom
2018-07-15 21:01:14 -07:00
43 changed files with 502 additions and 217 deletions
+1
View File
@@ -90,6 +90,7 @@ unit_test:
# Generate the Wren site.
docs:
mkdir -p build
$(V) ./util/generate_docs.py
# Continuously generate and serve the Wren site.