Permalink
Commits on Jan 10, 2014
  1. Merge pull request #876 from ochameau/fix-26

    Fix FF26 compatibility.
    mykmelez committed Jan 10, 2014
Commits on Dec 4, 2013
  1. Merge pull request #871 from ochameau/bars

    Replace bars xpcom component by a pref (before uplifting)
    mykmelez committed Dec 4, 2013
Commits on Nov 26, 2013
  1. Merge pull request #863 from ochameau/rotation

    Bug 925765 - Enable rotation button back
    mykmelez committed Nov 26, 2013
Commits on Oct 29, 2013
  1. Merge pull request #859 from ochameau/fixes

    Random fixes
    mykmelez committed Oct 29, 2013
Commits on Oct 21, 2013
  1. Merge pull request #854 from ochameau/cleanups

    Remove unused submodules
    mykmelez committed Oct 21, 2013
  2. Merge pull request #853 from ochameau/unregister

    Bug 921845 - Ensure unregistering the simulator on disabling/uninstallating
    mykmelez committed Oct 21, 2013
Commits on Oct 14, 2013
  1. Merge pull request #851 from ochameau/fix-marketplace

    Ensure building apps being used in production (allows marketplace to be installed)
    mykmelez committed Oct 14, 2013
Commits on Sep 26, 2013
  1. Merge pull request #840 from ochameau/ftp-hosting

    Ftp hosting
    mykmelez committed Sep 26, 2013
Commits on Sep 23, 2013
  1. update B2G/Gaia version string

    mykmelez committed Sep 23, 2013
  2. Merge pull request #836 from ochameau/update26

    Updates for 1.2/26
    mykmelez committed Sep 23, 2013
Commits on Sep 17, 2013
  1. make id and name more accurate

    mykmelez committed Sep 17, 2013
  2. update manifest metadata

    mykmelez committed Sep 17, 2013
  3. Merge branch 'integrate-app-manager' of https://github.com/ochameau/r…

    …2d2b2g into ochameau-integrate-app-manager
    mykmelez committed Sep 17, 2013
  4. Merge branch 'integrate-app-manager' of https://github.com/ochameau/r…

    …2d2b2g into ochameau-integrate-app-manager
    
    Conflicts:
    	Makefile
    	prosthesis/content/shell.xul
    mykmelez committed Sep 17, 2013
  5. Merge branch 'integrate-app-manager' of https://github.com/ochameau/r…

    …2d2b2g into ochameau-integrate-app-manager
    mykmelez committed Sep 17, 2013
  6. Merge branch 'integrate-app-manager' of https://github.com/ochameau/r…

    …2d2b2g into ochameau-integrate-app-manager
    
    Conflicts:
    	Makefile
    mykmelez committed Sep 17, 2013
Commits on Sep 16, 2013
Commits on Sep 13, 2013
  1. remove obsolete tests

    mykmelez committed Sep 13, 2013
  2. Merge branch 'integrate-app-manager' of https://github.com/ochameau/r…

    …2d2b2g into ochameau-integrate-app-manager
    
    Conflicts:
    	Makefile
    	gaia
    mykmelez committed Sep 13, 2013
  3. Merge pull request #833 from mykmelez/update-b2g-gaia

    update B2G/Gaia to 2013-09-04 tips of b2g18-simulator-integration/v1-train-integration branches
    mykmelez committed Sep 13, 2013
Commits on Sep 10, 2013
  1. Merge pull request #774 from bkase/windows-perf

    Improve Windows performance immensely
    mykmelez committed Sep 10, 2013
Commits on Sep 5, 2013
  1. Merge pull request #820 from brendandahl/thread-local

    Switch to thread local storage from cutils.
    mykmelez committed Sep 5, 2013
Commits on Aug 30, 2013
  1. Merge pull request #818 from mykmelez/update-b2g-gaia

    update B2G/Gaia to 2013-08-30 tips of b2g18-simulator-integration/v1-train-integration branches
    mykmelez committed Aug 30, 2013
  2. update B2G/Gaia to 2013-08-30 tips of b2g18-simulator-integration/v1-…

    …train-integration branches
    mykmelez committed Aug 30, 2013
  3. Merge pull request #817 from mykmelez/update-libadb

    update to latest version of libadb
    mykmelez committed Aug 30, 2013
  4. Merge pull request #816 from mykmelez/libadb-package

    add 'make package' libadb target to make libadb packages
    mykmelez committed Aug 30, 2013