Merge commit 'f74f4a540151aacb38306f2e41a160c326be3d51' into release/2.2

Browse Source

* commit 'f74f4a540151aacb38306f2e41a160c326be3d51':
  Prepare for 10.6 Release

Conflicts:
	RELEASE

Not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2015-03-09 12:38:44 +01:00

parent 71c63e799f f74f4a5401

commit e48f2847ab

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