A Git timeout occured. Only metadata is being displayed

Reviewing merge request #2203: Qt Simulator support

This merge contains various cleanups and fixes, which allow a simple implementation of Qt Simulator support.

If possible, please test if buildability for other OSes (Maemo, Windows, Mac) still works with these changes (they should, as they are mostly cleanups and simplifications).

Requested by: Anderson Lizardo
Status: Merged
Source repository: lizardo-pyside:playground
Target repository: pyside:master
Created at: August 26th, 2010 01:14

Commits that would be merged:

Version 1

Version 1

Comments
Include comments entered inline

→ State changed from Open to Reviewed Once

Luciano Wolf | 2010-08-26 14:38:12 UTC

→ State changed from Reviewed Once to Reviewed Twice

Hugo Parente Lima | 2010-08-26 14:43:51 UTC

→ State changed from Reviewed Twice to Merged

Anderson Lizardo | 2010-08-26 15:10:49 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/2203

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/pyside/pyside.git \
  refs/merge-requests/2203

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/2203

# To apply the changes to your branch:
git checkout master
git merge merge-requests/2203
git push origin master

Reviewing merge request #2203: Qt Simulator support

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline