Commit Graph

2 Commits

Author SHA1 Message Date
Tom Tromey
5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
Timothy Guan-tin Chien
9ed4429e08 Bug 1231701 - Ship our own variant of EmojiOne on Windows and Linux, r=glandium, r=dolske, r=jfkthame, r=gerv
This patch bundles a color font named "EmojiOne Mozilla", and turn on
the necessary code for including the bundled font, on Linux and Windows.
With that, users of Linux and Windows <=8.0 is able to see color Emoji
on Firefox without support from System.

The font bundled is the v0.2.1 version, generated from the project repo
in

https://github.com/mozilla/emojione-colr

with artwork from the original EmojiOne font and Twemoji,
under CC BY 4.0 license.

Test files, about:license page, and the packager instruction are
modified accordingly.

MozReview-Commit-ID: 2mmxnA0vS3u
2016-06-15 21:58:49 +01:00