[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/a412d990f043
changeset: 321:a412d990f043
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Sun Oct 12 19:59:06 2008 +0100
description:
	Merge

diffstat:

2 files changed, 27 insertions(+)
AUTHORS     |   26 ++++++++++++++++++++++++++
Makefile.am |    1 +

diffs (41 lines):

diff -r 5e12d7734036 -r a412d990f043 AUTHORS
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/AUTHORS	Sun Oct 12 19:59:06 2008 +0100
@@ -0,0 +1,26 @@
+The authors of the 1.x series are
+
+ * Balazs Dezso <deba at inf.elte.hu>
+ * Alpar Juttner <alpar at cs.elte.hu>
+ * Peter Kovacs <kpeter at inf.elte.hu>
+ * Akos Ladanyi <ladanyi at tmit.bme.hu>
+
+For more details on the actual contribution, please visit the history
+of the main LEMON source repository: http://lemon.cs.elte.hu/hg/lemon
+
+Moreover, this version is heavily based on the 0.x series of
+LEMON. Here is the list of people who contributed to those versions.
+
+ * Mihaly Barasz <klao at cs.elte.hu>
+ * Johanna Becker <beckerjc at cs.elte.hu>
+ * Attila Bernath <athos at cs.elte.hu>
+ * Balazs Dezso <deba at inf.elte.hu>
+ * Peter Hegyi <hegyi at tmit.bme.hu>
+ * Alpar Juttner <alpar at cs.elte.hu>
+ * Peter Kovacs <kpeter at inf.elte.hu>
+ * Akos Ladanyi <ladanyi at tmit.bme.hu>
+ * Marton Makai <marci at cs.elte.hu>
+ * Jacint Szabo <jacint at cs.elte.hu>
+
+Again, please visit the history of the old LEMON repository for more
+details: http://lemon.cs.elte.hu/svn/lemon/trunk
diff -r 5e12d7734036 -r a412d990f043 Makefile.am
--- a/Makefile.am	Fri Oct 10 13:22:37 2008 +0100
+++ b/Makefile.am	Sun Oct 12 19:59:06 2008 +0100
@@ -4,6 +4,7 @@
 LDADD = $(top_builddir)/lemon/libemon.la
 
 EXTRA_DIST = \
+	AUTHORS \
 	LICENSE \
 	m4/lx_check_cplex.m4 \
 	m4/lx_check_glpk.m4 \