Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

Browse Source

* qatar/release/0.5:
  Bump version number for the 0.5.11 release
  update year to 2013

Conflicts:
	VERSION

Merge is for metadata only, issues have been fixed in previous commits
already

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

...

This commit is contained in:

Michael Niedermayer

2013-08-17 22:06:56 +02:00

parent 81b754b1e4 588571d41d

commit b5f685211c

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