diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-22 02:08:33 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-22 02:08:33 -0300 |
| commit | 91968c1a437bb737168a14a4bb719815911dd39c (patch) | |
| tree | da5010414d85853fb2dfc08df9025648f996ef4f /extra/libsrtp | |
| parent | cdaa430a2be9eb7cb404bb4e0257ef1dd91f59ce (diff) | |
| parent | deef1b9af1fb8bb4c263d8aa1df699ef0d4d3b31 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/bochs/PKGBUILD
libre/p7zip-libre/PKGBUILD
libre/psutils-libre/PKGBUILD
Diffstat (limited to 'extra/libsrtp')
0 files changed, 0 insertions, 0 deletions