Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

Browse Source

* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
  x11grab: Drop a spurious space in the extension reporting message

Conflicts:
	libavdevice/x11grab.c

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

pull/88/head

Michael Niedermayer 10 years ago

parent 65c9e2d003 7bb505a33c

commit 1fc3963188

1 changed files with 1 additions and 1 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save