Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix crash when scanning corrupt midi file.jellybean-stablejellybean | Marco Nelissen | 2011-12-16 | 1 | -0/+5 |
| | | | | | | b/5453816 Change-Id: Ic2104fc0b86ef0b5ec3af7a009b193f85690d291 | ||||
* | am d868ec62: Reconcile gingerbread-plus-aosp and honeycomb | The Android Open Source Project | 2011-01-30 | 0 | -0/+0 |
|\ | | | | | | | * commit 'd868ec62e3db6f843d5857b2294d2b695b49ed59': | ||||
| * | Reconcile gingerbread-plus-aosp and honeycomb | The Android Open Source Project | 2011-01-30 | 0 | -0/+0 |
| |\ | | | | | | | | | | Change-Id: I6f6c22bca861de934a539e680a256f4374dece63 | ||||
| | * | Mass merge from gingerbread - do not merge | The Android Open Source Project | 2011-01-30 | 0 | -0/+0 |
| | |\ | | | | | | | | | | | | | Change-Id: I38bb9cc71b7b04cb3c71aa06561ed64c3b6a2ce4 | ||||
| | | * | am d029b237: Remove unused file. | Dan Bornstein | 2011-01-28 | 0 | -0/+0 |
| | |/| | | | | | | | | | | | | | | | | | * commit 'd029b2378170cfd7bb34d894482065a762a54578': Remove unused file. | ||||
* | | | | am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbread | The Android Open Source Project | 2011-01-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | * commit 'fbbe5ab5255f68cc9f0f10f36f680719b82955b6': | ||||
| * | | | am 42196fd1: am cdffe35c: merge from gingerbread | The Android Open Source Project | 2011-01-24 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | * commit '42196fd10398c7250af364c0563893d209c8cc15': | ||||
| | * \ \ | am cdffe35c: merge from gingerbread | The Android Open Source Project | 2011-01-21 | 0 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | * commit 'cdffe35cb330587b942f7771efad385261a03c83': | ||||
| | | * \ \ | merge from gingerbread | The Android Open Source Project | 2011-01-21 | 1 | -0/+0 |
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | Change-Id: I99e03b97ed48d1cc6cbd4176a55b1e06fc5ca5c1 | ||||
* | | | | | | am 7eaac433: am d2c550cd: am d029b237: Remove unused file. | Dan Bornstein | 2011-01-24 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7eaac4336c6feeabdb1bfdb390865571f73e9a51': Remove unused file. | ||||
| * | | | | | am d2c550cd: am d029b237: Remove unused file. | Dan Bornstein | 2011-01-24 | 0 | -0/+0 |
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | * commit 'd2c550cdd59acd54e5c831bcb20cc2ffad020a65': Remove unused file. | ||||
| | * | | | am d029b237: Remove unused file. | Dan Bornstein | 2011-01-21 | 1 | -0/+0 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | | * commit 'd029b2378170cfd7bb34d894482065a762a54578': Remove unused file. | ||||
| | | * | Remove unused file.cm-7.1.0gingerbread-releasegingerbreadgb-release-7.2 | Dan Bornstein | 2011-01-21 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | Change-Id: Ib50474510f2a95e398e279f34630bdc15b43809c | ||||
* | | | | am bc636d8f: (-s ours) Remove unused file. DO NOT MERGE. | Dan Bornstein | 2011-01-21 | 0 | -0/+0 |
|\| | | | | | | | | | | | | | | | | | | | * commit 'bc636d8fd6f3f9963e90af0cc5771c249f40084c': Remove unused file. DO NOT MERGE. | ||||
| * | | | Remove unused file. DO NOT MERGE. | Dan Bornstein | 2011-01-21 | 1 | -0/+0 |
|/ / / | | | | | | | | | | Change-Id: I1a5ee8e70ebfce7d289d0a71ec8af101187c1f21 | ||||
* | | | Fix engine state reporting. | Marco Nelissen | 2010-12-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | b/3290604 Change-Id: If1d15499575b1448c6c1c735718c2269b87fae3e | ||||
* | | | Add missing NOTICE files. | David Deephanphongs | 2010-10-19 | 1 | -0/+14 |
|/ / | | | | | | | | | | | | | Copy the NOTICE file from external/sonivox to external/sonivox/arm-wt-22k, where it will be picked up by the build system. Change-Id: Ieb1c6bbb510b6cc9c375c6250b70d9413aa511a7 | ||||
* | | am 91f74c00: add meta-files about 3rd party projects | The Android Open Source Project | 2010-07-16 | 1 | -0/+9 |
|\| | | | | | | | | | | | | | Merge commit '91f74c003b47a98a9af1999fe0caeff1f9678d33' into gingerbread-plus-aosp * commit '91f74c003b47a98a9af1999fe0caeff1f9678d33': add meta-files about 3rd party projects | ||||
| * | add meta-files about 3rd party projects | The Android Open Source Project | 2010-07-16 | 1 | -0/+9 |
| | | | | | | | | Change-Id: Iad572add7a8d4764b41128e1f1806adb89c83692 | ||||
* | | merge from open-source master | The Android Open Source Project | 2010-07-09 | 1 | -1/+1 |
|\ \ | |/ |/| | | | Change-Id: Id3bf2f86b2cac666dbb4bac69755ff5f8c270391 | ||||
| * | Fix missing NL | Bruce Beare | 2010-06-25 | 1 | -1/+1 |
|/ | | | | | Change-Id: I00dc89c1e9f0ac7f21707937619d3cdc364ca27d Signed-off-by: Bruce Beare <brucex.j.beare@intel.com> | ||||
* | Add an empty CleanSpec.mk | Jean-Baptiste Queru | 2010-03-08 | 1 | -0/+49 |
| | | | | Change-Id: I9634aed52bacd702362223bbfe29f59ff8c4fc3c | ||||
* | am 546b62cd: am d57f7d5f: reconcile main tree with open-source eclair | The Android Open Source Project | 2010-02-05 | 0 | -0/+0 |
|\ | | | | | | | | | | | | | Merge commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e' * commit '546b62cd4c1255bdb681c416d5c9b2ad22ff5e2e': android-2.1_r1 snapshot | ||||
| * | am d57f7d5f: reconcile main tree with open-source eclair | The Android Open Source Project | 2010-02-05 | 0 | -0/+0 |
| |\ | | | | | | | | | | | | | | | | | | | Merge commit 'd57f7d5f767dcfef8e318427e34e56bdb3da6eb6' into eclair-plus-aosp * commit 'd57f7d5f767dcfef8e318427e34e56bdb3da6eb6': android-2.1_r1 snapshot | ||||
| | * | reconcile main tree with open-source eclair | The Android Open Source Project | 2010-02-05 | 0 | -0/+0 |
| | |\ | |||||
| | | * | reconcile android-2.1_r1 snapshot | The Android Open Source Project | 2010-01-29 | 0 | -0/+0 |
| | |/| | |||||
| | | * | android-2.1_r1 snapshot | The Android Open Source Project | 2010-01-12 | 0 | -0/+0 |
| | | | | |||||
* | | | | merge from open-source master | Jean-Baptiste Queru | 2009-11-15 | 0 | -0/+0 |
|\| | | | |/ / |/| | | |||||
| * | | merge from open-source master | Jean-Baptiste Queru | 2009-11-15 | 0 | -0/+0 |
|/| | | | | | | | | | | | Merge commit 'goog/stage-korg-master' into HEAD | ||||
| * | | merge from eclair | Jean-Baptiste Queru | 2009-11-15 | 252 | -132823/+132829 |
| |\| | |||||
| | * | eclair snapshot | Jean-Baptiste Queru | 2009-11-12 | 252 | -132823/+132829 |
| | | | |||||
* | | | Fix infinite loop issue with correctly formed, but useless iMelody files ↵ | Dave Sparks | 2009-08-25 | 2 | -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 cleanup | Dave Sparks | 2009-08-24 | 252 | -132823/+132823 |
|/ / | |||||
* | | reconcile korg/master into goog/master | Jean-Baptiste Queru | 2009-07-26 | 0 | -0/+0 |
|\ \ | |||||
| * | | Merge korg/donut into korg/master | Jean-Baptiste Queru | 2009-07-25 | 8 | -0/+1 |
| |\| | |||||
* | | | Merge commit 'goog/readonly-korg-master' into merge_korg_master | Jean-Baptiste Queru | 2009-07-14 | 0 | -0/+0 |
|\| | | |||||
| * | | Merge commit 'korg/donut' | The Android Open Source Project | 2009-04-24 | 76 | -0/+27437 |
| |\ \ | |||||
| * \ \ | Merge commit 'korg/cupcake' | The Android Open Source Project | 2009-04-14 | 29 | -0/+11335 |
| |\ \ \ | |||||
* | \ \ \ | Merge donut into master | Jean-Baptiste Queru | 2009-04-22 | 0 | -0/+0 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | merge cupcake into donut | Jean-Baptiste Queru | 2009-04-22 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | AI 146818: Add JET template for Apple Logic 8 for easier creation of MIDI ↵ | Jean-Michel Trivi | 2009-04-17 | 3 | -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 Ducrohet | 2009-04-17 | 3 | -0/+0 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | BUG=1793093 Automated import of CL 146747 | ||||
| | * | | | AI 146462: Add JetCreator demo content. | Jean-Michel Trivi | 2009-04-16 | 3 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=1721874 Automated import of CL 146462 | ||||
| | * | | | AI 146399: Add sources of the OSX native lib for JetCreator. | Jean-Michel Trivi | 2009-04-15 | 9 | -0/+20124 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=1721874 Automated import of CL 146399 | ||||
| | * | | | AI 145803: Add Sonivox' JET documentation: authoring guidelines, JETCreator ↵ | Jean-Michel Trivi | 2009-04-11 | 64 | -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 Trivi | 2009-04-03 | 29 | -0/+11335 |
| | | | | | | | | | | | | | | | | | | | | | | | | BUG=1721874 Automated import of CL 144573 | ||||
* | | | | Merge donut into master | Jean-Baptiste Queru | 2009-04-22 | 2 | -0/+0 |
|\| | | | |||||
| * | | | Delete Mac system files that were submitted by accident | Jean-Baptiste Queru | 2009-04-20 | 2 | -0/+0 |
| | | | | |||||
| * | | | AI 146819: am: CL 146818 Add JET template for Apple Logic 8 for easier ↵ | Jean-Michel Trivi | 2009-04-18 | 3 | -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 Ducrohet | 2009-04-17 | 3 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (mac/windows only). Original author: xav Merged from: //branches/cupcake/... Automated import of CL 146750 |