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

[Michael Gilbert]

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

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

commit 819e1df518a7bbb3cec32b1d36be1712cca38cbe
Merge: 7c4ebb8 518d164
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Aug 24 13:25:56 2013 -0400

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

 debian/control                                     |    8 ++---
 .../patches/dont-assume-cross-compile-on-arm.patch |   37 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --cc debian/patches/series
index ce38549,b598317..5f99ee5
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -18,4 -18,5 +18,5 @@@ webkit-version.patc
  arm.patch
  icon.patch
  arm-neon.patch
 +gold-linker.patch
+ dont-assume-cross-compile-on-arm.patch
 -

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