Public Git Hosting - gfxprim.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2465d9f 90bea6f)

commit	56312f60da9d1cd165f522489a4c8b1821ec2820
author	Cyril Hrubis <metan@ucw.cz>
	Sat, 25 Feb 2012 13:55:31 +0000 (25 14:55 +0100)
committer	Cyril Hrubis <metan@ucw.cz>
	Sat, 25 Feb 2012 13:55:31 +0000 (25 14:55 +0100)
tree	9687f02a48b99b9ac88d2cdb66e43a21d30cac20	tree \| snapshot (tar.gz zip)
parent	2465d9f19ff464a62ca5a8488188cf234eac2fc0	commit \| diff
parent	90bea6f18d4e4562f63f196e9029fe2603793e83	commit \| diff

Merge branch 'master' into pywrap

Conflicts:
pylib/Makefile

include/core/Makefile	diff1 \|	diff2 \|	blob \| history
pylib/Makefile	diff1 \|	diff2 \|	blob \| history

A simple 2D graphics library with emphasis on correctness and well-defined operation.