Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CyanogenMod/android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ics
Choose a base ref
...
head repository: aksdev/android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ics
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 4, 2011

  1. Add my ics frameworks/base repo

    @ikarosdev
    ikarosdev committed Dec 4, 2011
    Configuration menu
    Copy the full SHA
    c0e9edf View commit details
    Browse the repository at this point in the history

  2. Get in there Triumph

    @ikarosdev
    ikarosdev committed Dec 4, 2011
    Configuration menu
    Copy the full SHA
    435efd9 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2011

  1. Fix stupid mistake

    @ikarosdev
    ikarosdev committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    f2a9f1e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cm-upstream/ics' into ics

    @ikarosdev
    ikarosdev committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    88a022c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'cm-upstream/ics' into ics

    @ikarosdev
    ikarosdev committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    acdb58a View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2011

  1. Merge remote-tracking branch 'cm-upstream/ics' into ics

    @ikarosdev
    ikarosdev committed Dec 15, 2011
    Configuration menu
    Copy the full SHA
    b104b8a View commit details
    Browse the repository at this point in the history

  2. Add my qcom_media repo

    @ikarosdev
    ikarosdev committed Dec 15, 2011
    Configuration menu
    Copy the full SHA
    d2c107c View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2011

  1. Merge remote-tracking branch 'cm-upstream/ics' into ics 

    Conflicts:
	default.xml
    @ikarosdev
    ikarosdev committed Dec 17, 2011
    Configuration menu
    Copy the full SHA
    3288a5a View commit details
    Browse the repository at this point in the history

  2. Fix conflict after the merge

    @ikarosdev
    ikarosdev committed Dec 17, 2011
    Configuration menu
    Copy the full SHA
    a69f191 View commit details
    Browse the repository at this point in the history

  3. Remove duplicate

    @ikarosdev
    ikarosdev committed Dec 17, 2011
    Configuration menu
    Copy the full SHA
    a9f6398 View commit details
    Browse the repository at this point in the history

  4. temporarily use nebkat's Launcher2 repo til CM tree gets 4.0.3 merge

    @ikarosdev
    ikarosdev committed Dec 17, 2011
    Configuration menu
    Copy the full SHA
    97928e7 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2011

  1. Revert "temporarily use nebkat's Launcher2 repo til CM tree gets 4.0.… 

    …3 merge"

This reverts commit 97928e7.

4.0.3 merge was committed. Let's go back to following upstream.
    @ikarosdev
    ikarosdev committed Dec 18, 2011
    Configuration menu
    Copy the full SHA
    8c4102e View commit details
    Browse the repository at this point in the history
Loading