diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-21 12:49:53 -0300 |
| commit | c02976460621a16b172e3e33432d5790f3ed6117 (patch) | |
| tree | c438b11c18e36170fd5ee7c767adda3f948e45bb /staging/kdemultimedia/mplayerthumbs.config | |
| parent | 79f56eaaa1e752a2f67072051b612acf5c648f69 (diff) | |
| parent | ae08410274473c5ab78d300ea2365c4b1070cc61 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/bdf-unifont/PKGBUILD
extra/convmv/PKGBUILD
extra/cowsay/PKGBUILD
extra/curl/PKGBUILD
extra/dbus-qt3/PKGBUILD
extra/emovix/PKGBUILD
extra/foobillard/PKGBUILD
extra/gnome-spell/PKGBUILD
extra/libssh2/PKGBUILD
extra/mkbootcd/PKGBUILD
extra/mozilla-common/PKGBUILD
extra/ndesk-dbus-glib/PKGBUILD
extra/xfwm4-themes/PKGBUILD
Diffstat (limited to 'staging/kdemultimedia/mplayerthumbs.config')
| -rw-r--r-- | staging/kdemultimedia/mplayerthumbs.config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config deleted file mode 100644 index 761a17953..000000000 --- a/staging/kdemultimedia/mplayerthumbs.config +++ /dev/null @@ -1,2 +0,0 @@ -[MPlayerThumbsCfg] -backend=0 |