Merge branch 'master' into release-3-5

Browse Source

Conflicts:
	scripts/tests/e3/rules.lua
	src/buildno.h
	src/kernel/version.h

...

This commit is contained in:

Enno Rehling 2015-06-08 08:45:48 +02:00

parent fb39835cf0 3e1ae5e0f2

commit 32b5d7c3d3

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