thyrsus.com Git - intercal.git/commit

]> thyrsus.com Git - intercal.git/commit

projects / intercal.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fd883f5 53db6ca)

author	Alex Smith <ais523@bham.ac.uk>
	Fri, 3 Sep 2010 07:18:47 +0000 (08:18 +0100)
committer	Alex Smith <ais523@bham.ac.uk>
	Fri, 3 Sep 2010 07:18:47 +0000 (08:18 +0100)
commit	c811100ef5b8d69eb2463b4731995792e40a4b3a
tree	18cbdb92dc32730675ba7f3747d6dcee7b9c6e70	tree \| snapshot
parent	fd883f5d62b4a81f22eda58bb92ccdfa5dff3a76	commit \| diff
parent	53db6cad7b114a62ed7f276830612909609f2437	commit \| diff

Merge branch 'master' of git://gitorious.org/intercal/intercal

Conflicts:
README
doc/ick.1

NEWS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
buildaux/Makefile.am	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/ick.1	diff1 \|	diff2 \|	blob \| history
doc/ick.txi	diff1 \|	diff2 \|	blob \| history

A compiler for the INTERCAL language.