summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-03232-110765/+0
|/
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-1/+1
* Initial ContributionThe Android Open Source Project2008-10-21506-173977/+4268
* external/freetype 2.3.5Upstream1970-01-12641-0/+280474