Reviewing merge request #3: BOO#21131 Location properties provided via contexkit

Moved location to a separate folder to build against location-skyhook. Need to subpackage location-geoclue and merge this patch.

Requested by: mcberardi
Status: Closed
Source repository: mcberardis-contextkit-meego:master
Target repository: contextkit-meego:master
Created at: July 20th, 2011 20:16

Commits that would be merged:

Version 1

Version 1

eb70769
8743d9f

First draft of integrating new provider into Contextkit API's. Will only get

d920b31

BMC#21131 Location properties provided via contextkit in subpackage

Showing

Showing eb70769-8743d9f

Comments
Include comments entered inline

Pushed new version 1

mcberardi | 2011-07-20 20:16:58 UTC

→ State changed from Open to Closed

this removes the old location plugin… which i don’t think we want to do.

tripzero | 2011-07-22 20:35:00 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/3

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/meego-handset-ux/contextkit-meego.git \
  refs/merge-requests/3

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

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

Reviewing merge request #3: BOO#21131 Location properties provided via contexkit

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline