summaryrefslogtreecommitdiff
path: root/extra/gnome-media
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-20 11:12:20 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-10-20 11:12:20 -0300
commit5c0a5f2b9fa7f1683f279728342aa7f5f0cf90a3 (patch)
treea55da6178b48e7abe9508505d3e92cf02a03da52 /extra/gnome-media
parentc56b2c50f5748090efb9f10f2a021e57a2455764 (diff)
parent1a136cf48dd7f710f38ff998182508f5a0d41c35 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/comix/PKGBUILD community/geany/PKGBUILD community/gnome-do-docklets/PKGBUILD community/gnome-do-plugins/PKGBUILD community/gnome-system-tools/PKGBUILD community/gnustep-make/PKGBUILD community/gtweakui/PKGBUILD community/hwinfo/PKGBUILD community/kungfu/PKGBUILD community/liboauth/PKGBUILD community/liboobs/PKGBUILD community/lua-lzlib/PKGBUILD community/mcdp/PKGBUILD community/mingw32-gcc-base/PKGBUILD community/mingw32-runtime/PKGBUILD community/mplayer2/PKGBUILD community/pdf2svg/PKGBUILD community/perl-data-dumper/PKGBUILD community/perl-digest-md5/PKGBUILD community/perl-perlio-eol/PKGBUILD community/perl-xml-libxslt/PKGBUILD community/python-cherrypy/PKGBUILD community/python-pexpect/PKGBUILD community/python-pyro/PKGBUILD community/python2-cherrypy/PKGBUILD community/rexima/PKGBUILD community/shp2svg/PKGBUILD community/system-tools-backends/PKGBUILD community/tracker/PKGBUILD community/virtualbox/PKGBUILD core/bridge-utils/PKGBUILD extra/avidemux/PKGBUILD extra/beagle/PKGBUILD extra/bug-buddy/PKGBUILD extra/dssi/PKGBUILD extra/evolution-sharp/PKGBUILD extra/evolution-webcal/PKGBUILD extra/feh/PKGBUILD extra/ffmpeg/PKGBUILD extra/gnome-mag/PKGBUILD extra/gnome-python-desktop/PKGBUILD extra/gnutls/PKGBUILD extra/gok/PKGBUILD extra/gpsd/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/hyphen/PKGBUILD extra/kdelibs/PKGBUILD extra/keytouch-editor/PKGBUILD extra/keytouch/PKGBUILD extra/koffice/PKGBUILD extra/krusader/PKGBUILD extra/libbeagle/PKGBUILD extra/libffi/PKGBUILD extra/libgnomeuimm/PKGBUILD extra/libreoffice/PKGBUILD extra/m17n-lib/PKGBUILD extra/mtr/PKGBUILD extra/openbabel/PKGBUILD extra/poppler/PKGBUILD extra/pulseaudio/PKGBUILD extra/rox/PKGBUILD extra/transmission/PKGBUILD extra/xf86-input-synaptics/PKGBUILD extra/xorg-server/PKGBUILD extra/xorg-xinit/PKGBUILD kde-unstable/calligra/PKGBUILD libre/icecat/PKGBUILD libre/linux-libre/PKGBUILD multilib/lib32-ncurses/PKGBUILD multilib/lib32-openssl/PKGBUILD multilib/lib32-talloc/PKGBUILD multilib/wine/PKGBUILD
Diffstat (limited to 'extra/gnome-media')
-rw-r--r--extra/gnome-media/gnome_volume_control_fix_channel_bars.patch12
1 files changed, 0 insertions, 12 deletions
diff --git a/extra/gnome-media/gnome_volume_control_fix_channel_bars.patch b/extra/gnome-media/gnome_volume_control_fix_channel_bars.patch
deleted file mode 100644
index 9d3de0331..000000000
--- a/extra/gnome-media/gnome_volume_control_fix_channel_bars.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur gnome-media-2.32.0/gnome-volume-control/src/gvc-channel-bar.c gnome-media-2.32.0.new/gnome-volume-control/src/gvc-channel-bar.c
---- gnome-media-2.32.0/gnome-volume-control/src/gvc-channel-bar.c 2010-09-28 15:46:15.000000000 +0100
-+++ gnome-media-2.32.0.new/gnome-volume-control/src/gvc-channel-bar.c 2010-12-31 15:14:23.964994328 +0000
-@@ -449,7 +449,7 @@
- /* Switch side scroll to vertical */
- if (direction == GDK_SCROLL_RIGHT)
- direction = GDK_SCROLL_UP;
-- else if (GDK_SCROLL_LEFT)
-+ else if (direction == GDK_SCROLL_LEFT)
- direction = GDK_SCROLL_DOWN;
- }
-