diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-11-10 12:38:40 +0100 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-11-10 12:38:40 +0100 |
| commit | 1008bebaded30e0c1dcce33300fa4096331aec4b (patch) | |
| tree | bf9a5b8e57fe6ec103414e76604afcb6894db0db /CHANGELOG | |
| parent | ae84f879d77bab5ea6fd9a4d74b82b46a11c9072 (diff) | |
| parent | 0a43ddf3209e13f5e87b07c440e03a45deea3e57 (diff) | |
Merge remote-tracking branch 'rzhxeo/rtmpdump_live'
Diffstat (limited to 'CHANGELOG')
0 files changed, 0 insertions, 0 deletions