Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

Browse source

Conflicts:
    doc/conf.py

...

This commit is contained in:

Colton Myers 2015-12-08 12:14:10 -07:00

parent de7f3d5a59 85aa70a6cb

commit 2c9c4ba430

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