summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix crash when scanning corrupt midi file.jellybean-stablejellybeanMarco Nelissen2011-12-161-0/+5
* am d868ec62: Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\
| * Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\
| | * Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| | |\
| | | * am d029b237: Remove unused file.Dan Bornstein2011-01-290-0/+0
| | | |\ | | |/ /
* | | | am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
|\ \ \ \ | |/ / /
| * | | am 42196fd1: am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-240-0/+0
| |\ \ \
| | * \ \ am cdffe35c: merge from gingerbreadThe Android Open Source Project2011-01-210-0/+0
| | |\ \ \
| | | * \ \ merge from gingerbreadThe Android Open Source Project2011-01-211-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | am 7eaac433: am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am d2c550cd: am d029b237: Remove unused file.Dan Bornstein2011-01-240-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | am d029b237: Remove unused file.Dan Bornstein2011-01-211-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Remove unused file.cm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Dan Bornstein2011-01-211-0/+0
* | | | am bc636d8f: (-s ours) Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-210-0/+0
|\ \ \ \ | |/ / /
| * | | Remove unused file. DO NOT MERGE.Dan Bornstein2011-01-211-0/+0
|/ / /
* | | Fix engine state reporting.Marco Nelissen2010-12-221-2/+2
* | | Add missing NOTICE files.David Deephanphongs2010-10-191-0/+14
|/ /
* | am 91f74c00: add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
|\ \ | |/
| * add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
* | merge from open-source masterThe Android Open Source Project2010-07-091-1/+1
|\ \ | |/ |/|
| * Fix missing NLBruce Beare2010-06-251-1/+1
|/
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-091-0/+49
* am 546b62cd: am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\
| | * reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| | |\
| | | * reconcile android-2.1_r1 snapshotThe Android Open Source Project2010-01-290-0/+0
| | | |\ | | |/ /
| | | * android-2.1_r1 snapshotThe Android Open Source Project2010-01-120-0/+0
* | | | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | merge from open-source masterJean-Baptiste Queru2009-11-150-0/+0
| |\ \ |/ / /
| * | merge from eclairJean-Baptiste Queru2009-11-15252-132823/+132829
| |\ \ | | |/
| | * eclair snapshotJean-Baptiste Queru2009-11-13252-132823/+132829
* | | Fix infinite loop issue with correctly formed, but useless iMelody files (bug...Dave Sparks2009-08-262-3/+9
* | | Sonivox whitespace cleanupDave Sparks2009-08-25252-132823/+132823
|/ /
* | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\ \
| * \ Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-268-0/+1
| |\ \ | | |/
* | | Merge commit 'goog/readonly-korg-master' into merge_korg_masterJean-Baptiste Queru2009-07-150-0/+0
|\ \ \ | |/ /
| * | Merge commit 'korg/donut'The Android Open Source Project2009-04-2476-0/+27437
| |\ \
| * \ \ Merge commit 'korg/cupcake'The Android Open Source Project2009-04-1529-0/+11335
| |\ \ \
* | \ \ \ Merge donut into masterJean-Baptiste Queru2009-04-230-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge cupcake into donutJean-Baptiste Queru2009-04-230-0/+0
| |\ \ \ \
| | * | | | AI 146818: Add JET template for Apple Logic 8 for easier creation of MIDI fil...Jean-Michel Trivi2009-04-183-0/+1
| | * | | | AI 146747: Add the JetCreator tools and docs to the SDK (mac/windows only).Xavier Ducrohet2009-04-173-0/+0
| | | |_|/ | | |/| |
| | * | | AI 146462: Add JetCreator demo content.Jean-Michel Trivi2009-04-163-0/+11
| | * | | AI 146399: Add sources of the OSX native lib for JetCreator.Jean-Michel Trivi2009-04-169-0/+20124
| | * | | AI 145803: Add Sonivox' JET documentation: authoring guidelines, JETCreator u...Jean-Michel Trivi2009-04-1164-0/+7302
| | | |/ | | |/|
| | * | AI 144573: Checking in Sonivox' JetCreator code.Jean-Michel Trivi2009-04-0429-0/+11335
* | | | Merge donut into masterJean-Baptiste Queru2009-04-232-0/+0
|\ \ \ \ | |/ / /
| * | | Delete Mac system files that were submitted by accidentJean-Baptiste Queru2009-04-202-0/+0
| * | | AI 146819: am: CL 146818 Add JET template for Apple Logic 8 for easier creati...Jean-Michel Trivi2009-04-183-0/+1
| * | | AI 146750: am: CL 146747 Add the JetCreator tools and docs to the SDK (mac/wi...Xavier Ducrohet2009-04-173-0/+0