[rtpproxy/el5/master: 16/16] Merge branch 'master' into el5/master
Peter Lemenkov
peter at fedoraproject.org
Sun Sep 19 12:08:49 UTC 2010
commit 5f256aca79805e308bb67366dd6c3923ccbc8e9f
Merge: dfdc078 159a6ca
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Sep 19 16:08:25 2010 +0400
Merge branch 'master' into el5/master
Conflicts:
.gitignore
rtpproxy.spec
.gitignore | 1 +
...-users-write-to-the-controlling-UNIX-sock.patch | 31 ++++++++++++++++++++
rtpproxy.spec | 9 ++++-
3 files changed, 39 insertions(+), 2 deletions(-)
---
More information about the scm-commits
mailing list