summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused file.cm-7.1.0gingerbread-releasegingerbreadgb-release-7.2Dan Bornstein2011-01-211-0/+0
| | | | Change-Id: Ib50474510f2a95e398e279f34630bdc15b43809c
* add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+9
| | | | Change-Id: Iad572add7a8d4764b41128e1f1806adb89c83692
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-091-0/+49
| | | | Change-Id: I9634aed52bacd702362223bbfe29f59ff8c4fc3c
* am 546b62cd: am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\ | | | | | | | | | | | | Merge commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e' * commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e': android-2.1_r1 snapshot
| * am d57f7d5f: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'd57f7d5f767dcfef8e318427e34e56bdb3da6eb6' into eclair-plus-aosp * commit 'd57f7d5f767dcfef8e318427e34e56bdb3da6eb6': android-2.1_r1 snapshot
| | * 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 commit 'goog/stage-korg-master' into HEAD
| * | 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 ↵Dave Sparks2009-08-262-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (bug 2068782). It is possible to construct a legitimate iMelody file that consists of only control commands such as ledon, ledoff, etc. in an infinite loop. If there are no notes or rests in the file, the iMelody parser will spin in an infinite loop sucking as many CPU cycles as it can get. This fix ignores loops that contain no notes or rests since they make no sense. The controls will be processed, but the loop will only execute once.
* | | 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 ↵Jean-Michel Trivi2009-04-183-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files to import in JetCreator BUG=1721874 Automated import of CL 146818
| | * | | | AI 146747: Add the JetCreator tools and docs to the SDK (mac/windows only).Xavier Ducrohet2009-04-173-0/+0
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | BUG=1793093 Automated import of CL 146747
| | * | | AI 146462: Add JetCreator demo content.Jean-Michel Trivi2009-04-163-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=1721874 Automated import of CL 146462
| | * | | AI 146399: Add sources of the OSX native lib for JetCreator.Jean-Michel Trivi2009-04-169-0/+20124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=1721874 Automated import of CL 146399
| | * | | AI 145803: Add Sonivox' JET documentation: authoring guidelines, JETCreator ↵Jean-Michel Trivi2009-04-1164-0/+7302
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | user manual, programming manual for the native library. BUG=1721874 Automated import of CL 145803
| | * | AI 144573: Checking in Sonivox' JetCreator code.Jean-Michel Trivi2009-04-0429-0/+11335
| | | | | | | | | | | | | | | | | | | | | | | | BUG=1721874 Automated import of CL 144573
* | | | 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 ↵Jean-Michel Trivi2009-04-183-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation of MIDI files to import in JetCreator Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 146819
| * | | AI 146750: am: CL 146747 Add the JetCreator tools and docs to the SDK ↵Xavier Ducrohet2009-04-173-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (mac/windows only). Original author: xav Merged from: //branches/cupcake/... Automated import of CL 146750
| * | | AI 146491: am: CL 146462 Add JetCreator demo content.Jean-Michel Trivi2009-04-163-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 146491
| * | | AI 146484: am: CL 146399 Add sources of the OSX native lib for JetCreator.Jean-Michel Trivi2009-04-169-0/+20124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 146484
| * | | AI 145974: am: CL 145803 Add Sonivox' JET documentation: authoring ↵Jean-Michel Trivi2009-04-1464-0/+7302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guidelines, JETCreator user manual, programming manual for the native library. Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 145974
| * | | AI 144575: am: CL 144573 Checking in Sonivox' JetCreator code.Jean-Michel Trivi2009-04-0429-0/+11335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 144575
| * | | Automated import from //branches/donutburger/...@140964,140964Jean-Michel Trivi2009-03-251-11412/+14720
| | | |
| * | | Automated import from //branches/donutburger/...@140867,140867Jean-Michel Trivi2009-03-251-4/+2
| | | |
| * | | Automated import from //branches/donutburger/...@140818,140818Dianne Hackborn2009-03-251-0/+14
| | | |
* | | | Merge branch 'readonly-p4-master'Jean-Michel Trivi2009-04-193-0/+1
|\ \ \ \
| * | | | AI 146844: am: CL 146819 am: CL 146818 Add JET template for Apple Logic 8 ↵Jean-Michel Trivi2009-04-193-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for easier creation of MIDI files to import in JetCreator Original author: jmtrivi Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146844
* | | | | Merge branch 'readonly-p4-master'Xavier Ducrohet2009-04-193-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | AI 146831: am: CL 146750 am: CL 146747 Add the JetCreator tools and docs to ↵Xavier Ducrohet2009-04-193-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the SDK (mac/windows only). Original author: xav Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146831
* | | | | Merge branch 'readonly-p4-master'Jean-Michel Trivi2009-04-193-0/+11
|\ \ \ \ \ | |/ / / /
| * | | | AI 146588: am: CL 146491 am: CL 146462 Add JetCreator demo content.Jean-Michel Trivi2009-04-193-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original author: jmtrivi Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146588
* | | | | Merge branch 'readonly-p4-master'Jean-Michel Trivi2009-04-199-0/+20124
|\ \ \ \ \ | |/ / / /
| * | | | AI 146585: am: CL 146484 am: CL 146399 Add sources of the OSX native lib for ↵Jean-Michel Trivi2009-04-199-0/+20124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JetCreator. Original author: jmtrivi Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146585
* | | | | Merge branch 'readonly-p4-master'Jean-Michel Trivi2009-04-1464-0/+7302
|\ \ \ \ \ | |/ / / /
| * | | | AI 146182: am: CL 145974 am: CL 145803 Add Sonivox' JET documentation: ↵Jean-Michel Trivi2009-04-1464-0/+7302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authoring guidelines, JETCreator user manual, programming manual for the native library. Original author: jmtrivi Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146182
* | | | | Merge branch 'readonly-p4-master'Jean-Michel Trivi2009-04-0429-0/+11335
|\ \ \ \ \ | |/ / / /
| * | | | AI 144576: am: CL 144575 am: CL 144573 Checking in Sonivox' JetCreator code.Jean-Michel Trivi2009-04-0429-0/+11335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original author: jmtrivi Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144576