Merge commit '26bbc1c242ebfeec3c49585207efac7293632433' into release/2.2

Browse Source

* commit '26bbc1c242ebfeec3c49585207efac7293632433':
  Prepare for 10 Release

Conflicts:
	RELEASE

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

...

This commit is contained in:

Michael Niedermayer 2014-03-23 19:54:52 +01:00

parent 13682b48e9 26bbc1c242

commit 9abe0bfb7f

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