Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chromium11 #12

Merged
merged 8 commits into from
Feb 15, 2012
Merged

Chromium11 #12

merged 8 commits into from
Feb 15, 2012

Conversation

drieks
Copy link

@drieks drieks commented Feb 15, 2012

Hi,

I fixed patches/chromium-gcc46-p1.patch.
gfx/codec/jpeg_codec.h was moved to ui/gfx/codec/jpeg_codec.h in chromium11

  • Dennis

ewencp added a commit that referenced this pull request Feb 15, 2012
@ewencp ewencp merged commit 196ff0a into sirikata:chromium11 Feb 15, 2012
@pathorn
Copy link
Member

pathorn commented Feb 17, 2012

Awesome! I believe Ewen pulled this one in on Wednesday.

On Wed, Feb 15, 2012 at 11:15 AM, drieks <
reply@reply.github.com

wrote:

Hi,

I fixed patches/chromium-gcc46-p1.patch.
gfx/codec/jpeg_codec.h was moved to ui/gfx/codec/jpeg_codec.h in chromium11

  • Dennis

You can merge this Pull Request by running:

git pull https://github.com/drieks/berkelium 51b8851

Or you can view, comment on it, or merge it online at:

#12

-- Commit Summary --

  • ppmrenderer win32 patch
  • Add binary directory rpath setting for ppmrender so you don't need to
    use LD_LIBRARY_PATH on Linux when running in-tree.
  • merged sirikata
  • Merge git://github.com/sirikata/berkelium into chromium11
  • Merge branch 'chromium11' of github.com:drieks/berkelium into chromium11
  • Updated vcproj file
  • Merge branch 'chromium11' of https://github.com/sirikata/berkelium into
    chromium11
  • gfx/codec/jpeg_codec.h was moved to ui/gfx/codec/jpeg_code.h: patch fixed

-- File Changes --

M patches/chromium-gcc46-p1.patch (4)

-- Patch Links --

https://github.com/sirikata/berkelium/pull/12.patch
https://github.com/sirikata/berkelium/pull/12.diff


Reply to this email directly or view it on GitHub:
#12

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants