Public Git Hosting - tinycc/daniel.git/commit

commit	12ddb01e29d82afd85690137b7de01a3bc842c0b
author	Daniel Glöckner <daniel-gl@gmx.net>
	Thu, 20 Nov 2008 10:20:45 +0000 (20 11:20 +0100)
committer	Daniel Glöckner <daniel-gl@gmx.net>
	Thu, 20 Nov 2008 10:20:45 +0000 (20 11:20 +0100)
tree	48a069fe2c13ec9c836df9a4141e570756340218	tree \| snapshot (tar.gz zip)
parent	3ade6e8d9d1fcc32b020c22e5bf4b92fff8e78ca	commit \| diff
parent	7bebf1f59a983255e6c029995583f360f30f1a04	commit \| diff

Merge branch 'master' into mine-local

Conflicts:
Makefile