Merge remote-tracking branch 'o/dev' into use-nuget-instead-of-lib-folder

Browse Source

Conflicts:
	lib/mysql/COPYING
	lib/mysql/README

...

This commit is contained in:

Zoltán Lehóczky 2015-12-14 17:14:36 +01:00

parent 8609b167e8 70ff08f4b7

commit 5bc2ddcabf

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 Not Available