summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Ricardo Cerqueira2013-11-01192-7827/+18299
|\
| * Enable FT_CONFIG_OPTION_USE_PNG, build shared libVictoria Lease2013-06-272-3/+7
| * Disable old 'freetype' CFF hint engine.Victoria Lease2013-06-171-1/+1
| * Update freetype to 5e094c6fb2ddd6e8901a5679e2cbb8fa476a38eeVictoria Lease2013-06-10191-7825/+18293
|/
* Remove obsolete ThirdPartyProject.prop file.cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Elliott Hughes2012-05-151-10/+0
* Update to freetype 2.4.9Eric Vannier2012-04-20106-1239/+1802
* Updated freetype to 2.4.8Geremy Condra2011-12-1610-37/+231
* Merge "DO NOT MERGE Update FreeType library to 2.4.7"Geremy Condra2011-11-1732-3209/+8496
|\
| * DO NOT MERGE Update FreeType library to 2.4.7Olivier Bailly2011-11-1132-3209/+8496
* | am 15321e16: Add additional implementation files needed by Skia.Derek Sollenberger2011-11-100-0/+0
|\ \ | |/ |/|
| * Add additional implementation files needed by Skia.Derek Sollenberger2011-11-103-0/+158
* | Add additional implementation files needed by Skia.Derek Sollenberger2011-11-083-0/+158
|/
* Update to FreeType 2.4.6+David 'Digit' Turner2011-08-1772-1284/+3565
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-9/+0
* am 6b1b3194: am 0c30ba13: Merge "improve compatibility"Jean-Baptiste Queru2011-05-110-0/+0
|\
| * am 0c30ba13: Merge "improve compatibility"Jean-Baptiste Queru2011-05-111-0/+1
| |\
| | * Merge "improve compatibility"Jean-Baptiste Queru2011-05-111-0/+1
| | |\
| | | * improve compatibilityJean-Baptiste Queru2011-05-111-0/+1
| | |/
* | / Fix linking issues in external/skia because of missing implementation.Derek Sollenberger2011-03-171-0/+1
|/ /
* | Upgrade to upstream 2.4.4David 'Digit' Turner2011-01-2622-316/+660
* | am aacb8e13: upgrade freetype to 2.4.2.Nick Kralevich2010-09-1674-858/+1641
|\|
| * upgrade freetype to 2.4.2.Nick Kralevich2010-09-1574-858/+1641
* | am d4476115: am ff8c8b2d: Apply stack overflow patch from http://git.savannah...Chris Palmer2010-08-090-0/+0
|\|
| * am ff8c8b2d: Apply stack overflow patch from http://git.savannah.gnu.org/cgit...Chris Palmer2010-08-091-1/+4
| |\
| | * Apply stack overflow patch fromChris Palmer2010-08-091-1/+4
* | | Apply patch to fix bug used in iPhone jailbreak.Chris Palmer2010-08-091-1/+4
|/ /
* / add meta-files about 3rd party projectsThe Android Open Source Project2010-07-161-0/+10
|/
* Add an empty CleanSpec.mkJean-Baptiste Queru2010-03-081-0/+49
* Update to FreeType 2.3.12David 'Digit' Turner2010-03-03159-1811/+6467
* am 7b1211d2: am 07007660: reconcile main tree with open-source eclairThe Android Open Source Project2010-02-050-0/+0
|\
| * am 07007660: 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-153-12/+14
| |\|
| | * eclair snapshotJean-Baptiste Queru2009-11-123-12/+14
* | | freetype: remove outdated VERSION.TXT.Chia-chi Yeh2009-09-021-2/+0
* | | reconcile korg/master into goog/masterJean-Baptiste Queru2009-07-260-0/+0
|\| |
| * | Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-25110-2569/+4137
| |\|
* | | resolved conflicts for merge 77f63d to masterDavid 'Digit' Turner2009-06-0920-105/+343
|\ \ \ | | |/ | |/|
| * | Integrate FreeType 2.3.9 into the donut tree.David 'Digit' Turner2009-06-08110-2566/+4136
* | | am d048699: Remove a reference to TARGET_BUILD_TYPEDave Bort2009-04-291-3/+1
|\| |
| * | Remove a reference to TARGET_BUILD_TYPEDave Bort2009-04-231-3/+1
* | | Merge donut into masterJean-Baptiste Queru2009-04-220-0/+0
|\| |
* | | Merge branch 'open_source_no_contributions' into google_internalThe Android Open Source Project2009-03-290-0/+0
|\ \ \ | | |/ | |/|
| * | Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-180-0/+0
| |\|
* | | auto import //branches/master/...@140412The Android Open Source Project2009-03-18108-2509/+3845
| |/ |/|
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03232-0/+110765