Merge branch 'maint'

Browse source

Conflicts:
	src/version.h

...

This commit is contained in:

Randy Heit 2013-07-02 15:49:10 -05:00

parent 44dd79953b 5b17c0779b

commit ff49de164a

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available