summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-02-17 23:49:21 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2012-02-17 23:49:21 +0100
commit82a43ad1ab6d206822259aa23335a791370bb97f (patch)
tree0e5bdcb464504827e81f5b4c014e2067aaecff0d /docs
parentfdfe4ed445ee4df20675abe0289fee6817bef4e1 (diff)
parentf76f7374ea2227b8422aa6c3b1e084fff0180d0a (diff)
Merge branch 'master' into 0.11
Conflicts: gst/equalizer/gstiirequalizer.c
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions