Merge branch 'master'

This commit is contained in:
David Capello 2016-05-05 23:00:12 -03:00
commit ed14c56455

View File

@ -165,7 +165,7 @@ the following parameters and then `ninja`:
-DUSE_ALLEG4_BACKEND=OFF \
-DUSE_SKIA_BACKEND=ON \
-DSKIA_DIR=$HOME/deps/skia \
-DWITH_HarfBuzz=OFF" \
-DWITH_HarfBuzz=OFF \
-G Ninja \
..
ninja aseprite