Michael Niedermayer 8d4460f1bb Merge commit '8fcd121b823caeadbe7597c9ae9229f6f164f949'
* commit '8fcd121b823caeadbe7597c9ae9229f6f164f949':
  doc: Use the succinct syntax for the channelmap example

Conflicts:
	doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 12:11:10 +02:00
..
2014-07-20 02:01:50 +02:00
2015-06-10 13:08:48 -08:00
2015-04-23 23:56:21 -07:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2012-12-21 00:18:34 +01:00
2013-02-14 23:45:48 +01:00
2015-02-02 05:04:14 +01:00