projects / platform / upstream / gstreamer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f04b8fd dc28bd1)
Merge remote-tracking branch 'origin/master' into 0.11
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Tue, 6 Sep 2011 15:42:42 +0000 (16:42 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Tue, 6 Sep 2011 15:42:42 +0000 (16:42 +0100)
commit4529c6dc325d2009670fe0f9145f5a6b867aba43
treee7fdef78b6265aff05f3c4f1afc619fa7f770881tree | snapshot
parentf04b8fd8af607eeb32463616c7a1fe53b1256bdfcommit | diff
parentdc28bd1b634bfcf6aace92fd711e9202ede75a8bcommit | diff
Merge remote-tracking branch 'origin/master' into 0.11

Merge in doc updates for audio enums from 0.10, and get rid
of the #if #else in the enum list, since that confuses gtk-doc.

Conflicts:
gst-libs/gst/audio/audio.c
gst-libs/gst/audio/audio.h
docs/libs/gst-plugins-base-libs-sections.txt diff1 | diff2 | blob | history
gst-libs/gst/audio/audio.h diff1 | diff2 | blob | history
Domain: Multimedia / Media Common;