Merge branch '0.4.x' into 0.5.x

Browse Source

Conflicts:
	doc/build-msw.txt
	src/makefile.linux-mingw
	src/makefile.mingw

...

This commit is contained in:

Luke Dashjr

2012-04-27 13:52:02 -04:00

parent b7a2b6e1aa 5ad4028050

commit 824e8dde8b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available