Merge pull request #453 from mrdudz/waitvsync

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

Tue, 18 Jul 2017 13:38:27 +0000 (15:38 +0200)

committer GitHub <noreply@github.com>

Tue, 18 Jul 2017 13:38:27 +0000 (15:38 +0200)
author Oliver Schmidt <ol.sc@web.de>
Tue, 18 Jul 2017 13:38:27 +0000 (15:38 +0200)
committer GitHub <noreply@github.com>
Tue, 18 Jul 2017 13:38:27 +0000 (15:38 +0200)
diff --cc doc/funcref.sgml
Simple merge
diff --cc doc/pce.sgml
Simple merge
diff --cc include/cbm.h
Simple merge
author	Oliver Schmidt <ol.sc@web.de>
	Tue, 18 Jul 2017 13:38:27 +0000 (15:38 +0200)
committer	GitHub <noreply@github.com>
	Tue, 18 Jul 2017 13:38:27 +0000 (15:38 +0200)
		1	2
doc/funcref.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
doc/pce.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
include/cbm.h	patch \|	diff1 \|	diff2 \|	blob \| history