A. Fachat bd65f3de18 Merge branch 'testsuite' into testmerge ...

Resolved Conflicts:
	xa/ChangeLog
	xa/src/xa.c
	xa/tests/adrm/Makefile
	xa/tests/binclude/Makefile
	xa/tests/charset/Makefile
	xa/tests/comcom/Makefile
	xa/tests/fordef/Makefile
	xa/tests/incerr/Makefile

2014-08-20 22:13:20 +02:00

..

file65.c

merge Cameron's 2.3.6 official release into master

2014-08-20 21:53:15 +02:00

ldo65.c

merge Cameron's 2.3.6 official release into master

2014-08-20 21:53:15 +02:00

Makefile

merge Cameron's 2.3.6 official release into master

2014-08-20 21:53:15 +02:00

mkrom.sh

added stable version 2.3.5

2011-12-16 23:04:51 +01:00

printcbm.c

merge Cameron's 2.3.6 official release into master

2014-08-20 21:53:15 +02:00

reloc65.c

Merge branch 'testsuite' into testmerge

2014-08-20 22:13:20 +02:00

uncpk.c

merge Cameron's 2.3.6 official release into master

2014-08-20 21:53:15 +02:00

version.h

added stable version 2.3.5

2011-12-16 23:04:51 +01:00