You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by mx...@apache.org on 2018/11/02 00:52:22 UTC
[tcl-rivet] 03/03: fixed conflict in changelog
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit ece5f0c066064243c2f74015c33f4f9c1b8501da
Merge: 976c734 f8cbb7a
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Fri Nov 2 01:51:46 2018 +0100
fixed conflict in changelog
.gitignore | 31 +++++++++++++++++++++++++++++++
ChangeLog | 7 +++++++
Makefile.in | 6 +++---
doc/rivet.xml | 4 +---
doc/rivet.xml.in | 4 +---
rivet/init.tcl | 1 +
6 files changed, 44 insertions(+), 9 deletions(-)
diff --cc ChangeLog
index 913ab08,ee0609d..853958b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,10 +1,13 @@@
+2018-11-02 Massimo Manghi <mx...@apache.org>
+ * rivet/packages/dio/: integrating changes done in the master branch.
+ Basically fully qualifying commands that need the ::rivet namespace
+ 2018-08-07 Massimo Manghi <mx...@apache.org>
+ * rivet/init.tcl: reflecting the changes in init.tcl.in
+ * doc/rivet.xml: removed subversion related keyword
+
+ 2018-08-16 Massimo Manghi <mx...@apache.org>
+ * .gitignore: add file copied from master
+ * doc/rivet.xml.in: removed no more supported SVN keywords
2018-07-07 Massimo Manghi <mx...@apache.org>
* Changelog: released as rivet 3.0.2
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org