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

author sigetch <sigetch@users.sourceforge.jp>

Thu, 19 Jan 2012 12:04:35 +0000 (21:04 +0900)

committer sigetch <sigetch@users.sourceforge.jp>

Thu, 19 Jan 2012 12:04:35 +0000 (21:04 +0900)
author sigetch <sigetch@users.sourceforge.jp>
Thu, 19 Jan 2012 12:04:35 +0000 (21:04 +0900)
committer sigetch <sigetch@users.sourceforge.jp>
Thu, 19 Jan 2012 12:04:35 +0000 (21:04 +0900)
diff --cc brushlib/brush.hpp
Simple merge
diff --cc gui/document.py
Simple merge
author	sigetch <sigetch@users.sourceforge.jp>
	Thu, 19 Jan 2012 12:04:35 +0000 (21:04 +0900)
committer	sigetch <sigetch@users.sourceforge.jp>
	Thu, 19 Jan 2012 12:04:35 +0000 (21:04 +0900)
		1	2
brushlib/brush.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
gui/document.py	patch \|	diff1 \|	diff2 \|	blob \| history