This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch winbuild
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit b969bd8e3a7712fd0b29146d275a1dbab55cf082
Merge: dc40bcd fd24aff
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Sun Dec 16 18:05:25 2018 +0100
fix merge conflict
ChangeLog | 3 +++
1 file changed, 3 insertions(+)
diff --cc ChangeLog
index 38e2c4f,24d74d2..8d2ae46
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,11 @@@
+2018-12-08 Massimo Manghi <mxman...@apache.org>
+ * cmake/CMakeList.c: changed suffix of librivetparser.so and librivet.so
+ * src/mod_rivet_ng: various changes to have a compilable module
+ on Windows. Still the module not working tough
+
+ 2018-12-07 Massimo Manghi <mxman...@apache.org>
+ * rivet/pkgIndex.tcl: completed with actual list of packages
+
2018-12-04 Massimo Manghi <mxman...@apache.org>
* configure.ac: now infer the version number from VERSION.
* doc/rivet.xml,doc/xml/examples.xml: modified example "color table"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org
