diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-02-07 11:59:40 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-02-07 11:59:40 +0100 |
| commit | cb1c3828de71185f02b21a69150f968d64412cc5 (patch) | |
| tree | 383bbff3b0da9b627d11d55ba3880cbe12463b6d /streamer.h | |
| parent | e0cb4500dd05050e60414b7bb25d91f392435437 (diff) | |
| parent | 1d259b115c302a23c6e2ccfe96b88e5135d033e7 (diff) | |
Merge branch 'master' into devel
Conflicts:
Makefile.am
configure.ac
plugins/ffmpeg/ffmpeg.c
plugins/gtkui/gtkui.c
streamer.c
Diffstat (limited to 'streamer.h')
0 files changed, 0 insertions, 0 deletions