diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-20 17:18:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 17:18:34 +0200 |
| commit | 16938adfc00b3c56a7b08a9eb97160b68902bae6 (patch) | |
| tree | 6e818b95c8557872e39f23c00f5a60e09f2f11bc /util | |
| parent | 318106223fc7351bd879980c17ee9c4bee65a272 (diff) | |
| download | minetest-16938adfc00b3c56a7b08a9eb97160b68902bae6.tar.gz minetest-16938adfc00b3c56a7b08a9eb97160b68902bae6.tar.bz2 minetest-16938adfc00b3c56a7b08a9eb97160b68902bae6.zip | |
Merge cguittfont lib in irrlicht change folder. (#6016)
* Merge cguittfont lib in irrlicht change folder.
This remove hack and static lib for FreeType
Diffstat (limited to 'util')
| -rw-r--r-- | util/travis/clang-format-whitelist.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt index 66e312cdb..f276af282 100644 --- a/util/travis/clang-format-whitelist.txt +++ b/util/travis/clang-format-whitelist.txt @@ -3,10 +3,6 @@ src/ban.cpp src/camera.cpp src/camera.h src/cavegen.cpp -src/cguittfont/CGUITTFont.cpp -src/cguittfont/CGUITTFont.h -src/cguittfont/irrUString.h -src/cguittfont/xCGUITTFont.h src/chat.cpp src/chat.h src/chat_interface.h @@ -113,6 +109,9 @@ src/inventory.cpp src/inventory.h src/inventorymanager.cpp src/inventorymanager.h +src/irrlicht_changes/CGUITTFont.cpp +src/irrlicht_changes/CGUITTFont.h +src/irrlicht_changes/irrUString.h src/irrlicht_changes/static_text.cpp src/irrlicht_changes/static_text.h src/irrlichttypes.h |