Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-25 09:34:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #379 from metajack/fix-merge-errors

Browse source 
Fix merge errors from the refactor-gfx merge.
This commit is contained in:
Brian Anderson 2013-04-18 16:50:43 -07:00
commit 2a72f3d148
2 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/servo-gfx/platform/linux/font.rs
View file

@ -4,7 +4,6 @@
extern mod freetype; extern mod freetype;
use freetype_impl::font_context::FreeTypeFontContextHandle;
use font::{CSSFontWeight, FontHandleMethods, FontMetrics, FontTableMethods}; use font::{CSSFontWeight, FontHandleMethods, FontMetrics, FontTableMethods};
use font::{FontTableTag, FractionalPixel, SpecifiedFontStyle, UsedFontStyle, FontWeight100}; use font::{FontTableTag, FractionalPixel, SpecifiedFontStyle, UsedFontStyle, FontWeight100};
use font::{FontWeight200, FontWeight300, FontWeight400, FontWeight500, FontWeight600}; use font::{FontWeight200, FontWeight300, FontWeight400, FontWeight500, FontWeight600};

2
src/servo-gfx/platform/linux/font_list.rs
View file

@ -5,8 +5,6 @@
extern mod freetype; extern mod freetype;
extern mod fontconfig; extern mod fontconfig;
use freetype_impl::font_context::FreeTypeFontContextHandle;
use freetype_impl::font::FreeTypeFontHandle;
use self::fontconfig::fontconfig::{FcChar8, FcResultMatch, FcSetSystem, use self::fontconfig::fontconfig::{FcChar8, FcResultMatch, FcSetSystem,
FcResultNoMatch, FcMatchPattern}; FcResultNoMatch, FcMatchPattern};
use self::fontconfig::fontconfig::bindgen::{ use self::fontconfig::fontconfig::bindgen::{