From: jedeoric <plifplouf78@hotmail.com>
Date: Sun, 22 Oct 2017 21:11:18 +0000 (+0200)
Subject: Merge branch 'master' into master
X-Git-Tag: V2.17~82^2~1^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=af1c7f0c8b7e72c26432b0b1d40146b12c298a45;p=cc65

Merge branch 'master' into master
---

af1c7f0c8b7e72c26432b0b1d40146b12c298a45
diff --cc doc/telestrat.sgml
index 0c85c68c5,243097a84..2d05f8985
--- a/doc/telestrat.sgml
+++ b/doc/telestrat.sgml
@@@ -9,8 -9,9 +9,10 @@@
  <date>2017-01-22
  
  <abstract>
 -An overview over the Telestrat (<url name="Telemon 3.0"
 -url="http://orix.oric.org">) runtime system as it is implemented for the
 -cc65 C compiler.
++
 +An overview over the Telestrat (Telemon 2.4 & Telemon 3.x : http://orix.oric.org) runtime system as it is implemented for the cc65 C
 +compiler.)
++
  </abstract>
  
  <!-- Table of contents -->