diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-22 12:33:35 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-22 12:33:35 +0200 |
| commit | 8170c34c943e83c7fdef30394bbbff09418a2e6c (patch) | |
| tree | 8f699b96a5988284fa7d7af08e30e0b46bc7cc66 /gst/gstelementfactory.c | |
| parent | 405a5d2a925ff9fbe582ad70ed4b6ed90e3f5b15 (diff) | |
| parent | ec6e452f6314b10e883c6f95366867a02c775ff0 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst/gstbuffer.h
gst/gstcaps.c
gst/gstcaps.h
gst/gstevent.c
Diffstat (limited to 'gst/gstelementfactory.c')
| -rw-r--r-- | gst/gstelementfactory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/gstelementfactory.c b/gst/gstelementfactory.c index a03066a728..647674ecf9 100644 --- a/gst/gstelementfactory.c +++ b/gst/gstelementfactory.c @@ -626,7 +626,7 @@ typedef struct * @factory: a #GstElementFactory * @type: a #GstElementFactoryListType * - * Check if @factory if of the given types. + * Check if @factory is of the given types. * * Returns: %TRUE if @factory is of @type. * |