Merge pull request #829 from inexorabletash/string-escapes

author Oliver Schmidt <ol.sc@web.de>

Sun, 20 Jan 2019 20:58:06 +0000 (21:58 +0100)

committer GitHub <noreply@github.com>

Sun, 20 Jan 2019 20:58:06 +0000 (21:58 +0100)
author Oliver Schmidt <ol.sc@web.de>
Sun, 20 Jan 2019 20:58:06 +0000 (21:58 +0100)
committer GitHub <noreply@github.com>
Sun, 20 Jan 2019 20:58:06 +0000 (21:58 +0100)
diff --cc doc/ca65.sgml
Simple merge
diff --cc src/ca65/scanner.c
Simple merge
author	Oliver Schmidt <ol.sc@web.de>
	Sun, 20 Jan 2019 20:58:06 +0000 (21:58 +0100)
committer	GitHub <noreply@github.com>
	Sun, 20 Jan 2019 20:58:06 +0000 (21:58 +0100)
		1	2
doc/ca65.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
src/ca65/scanner.c	patch \|	diff1 \|	diff2 \|	blob \| history