From: Patrik Gornicz <Gornicz.P@gmail.com>
Date: Fri, 1 May 2009 23:10:29 +0000 (-0400)
Subject: Merge branch 'master' into libpg
X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=commitdiff_plain;h=41379c9cf8b7128f23a9c285d3e50cad0d5d2de4;hp=41379c9cf8b7128f23a9c285d3e50cad0d5d2de4;p=physics.git

Merge branch 'master' into libpg

Conflicts:
	Makefile
---