[Pkg-chromium-commit] [pkg-chromium] 02/02: Merge branch 'master' of ssh://git.debian.org/git/pkg-chromium/pkg-chromium

[Giuseppe Iuculano]

This is an automated email from the git hooks/post-receive script.

iuculano pushed a commit to branch master
in repository pkg-chromium.

commit 90375374d5604a6c41bd8757db343d7baf3c4268
Merge: 6651f1c 18341ce
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat Oct 12 10:20:55 2013 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-chromium/pkg-chromium
    
    Conflicts:
    	debian/control

 debian/TODO                              |   10 +-
 debian/changelog                         |  140 ++++++++++++++++
 debian/chromium.install                  |    1 +
 debian/control                           |  260 +++++++++++++-----------------
 debian/copyright                         |    2 -
 debian/lintian-overrides                 |    2 +
 debian/patches/arm-neon.patch            |   14 +-
 debian/patches/arm-no-float-abi.patch    |   13 --
 debian/patches/armv4.patch               |    8 +-
 debian/patches/chromium_useragent.patch  |   34 ----
 debian/patches/cups1.5.patch             |   26 ---
 debian/patches/fix_null_conversion.patch |   60 -------
 debian/patches/gcc4.7.patch              |  105 ------------
 debian/patches/gcc46.patch               |  122 --------------
 debian/patches/gold-linker.patch         |   20 +++
 debian/patches/libav0.8.patch            |   10 --
 debian/patches/no_tree_sink_v8.patch     |   26 ---
 debian/patches/nspr.patch                |   42 ++---
 debian/patches/nss.patch                 |   24 +--
 debian/patches/prefs.patch               |    8 +-
 debian/patches/pulse_ftbfs.patch         |   13 --
 debian/patches/series                    |    6 +-
 debian/patches/system-speech.patch       |   24 +--
 debian/patches/webkit-version.patch      |   21 ---
 debian/rules                             |   93 +++--------
 25 files changed, 360 insertions(+), 724 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git