aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/fc-blanks/fcblanks.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2015-03-051-0/+4223
Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/queryobj.c