summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divVerent@xonotic.org>2013-12-18 17:48:21 +0100
committerRudolf Polzer <divVerent@xonotic.org>2013-12-18 17:48:21 +0100
commita8f05a1d5a4b1cbd246b6d4db6b2af9b1c8ceb04 (patch)
treef6e3220a24885a0cf3662e156591ca7d46d356c7
parent6be09f6c39481ebbf3fae603351b2ac28d48f4b2 (diff)
parent3cbc67284e1c3ae290bdf2a872272a2b004eafbb (diff)
downloadmpv-build-divVerent/no-more-submodules.tar.bz2
mpv-build-divVerent/no-more-submodules.tar.xz
Merge branch 'master' into divVerent/no-more-submodulesdivVerent/no-more-submodules
Conflicts: ffmpeg mpv
0 files changed, 0 insertions, 0 deletions