git.librecmc.org Git - oweals/minetest.git/commit

projects / oweals / minetest.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 3181062) | patch

author	Loïc Blot <nerzhul@users.noreply.github.com>
	Tue, 20 Jun 2017 15:18:34 +0000 (17:18 +0200)
committer	GitHub <noreply@github.com>
	Tue, 20 Jun 2017 15:18:34 +0000 (17:18 +0200)
commit	16938adfc00b3c56a7b08a9eb97160b68902bae6
tree	6e818b95c8557872e39f23c00f5a60e09f2f11bc	tree \| snapshot
parent	318106223fc7351bd879980c17ee9c4bee65a272	commit \| diff

Merge cguittfont lib in irrlicht change folder. (#6016)

* Merge cguittfont lib in irrlicht change folder.

This remove hack and static lib for FreeType

15 files changed:

src/CMakeLists.txt		diff \| blob \| history
src/cguittfont/CGUITTFont.cpp	[deleted file]	blob \| history
src/cguittfont/CGUITTFont.h	[deleted file]	blob \| history
src/cguittfont/CMakeLists.txt	[deleted file]	blob \| history
src/cguittfont/irrUString.h	[deleted file]	blob \| history
src/cguittfont/xCGUITTFont.cpp	[deleted file]	blob \| history
src/cguittfont/xCGUITTFont.h	[deleted file]	blob \| history
src/fontengine.cpp		diff \| blob \| history
src/guiChatConsole.cpp		diff \| blob \| history
src/irrlicht_changes/CGUITTFont.cpp	[new file with mode: 0644]	blob
src/irrlicht_changes/CGUITTFont.h	[new file with mode: 0644]	blob
src/irrlicht_changes/CMakeLists.txt		diff \| blob \| history
src/irrlicht_changes/irrUString.h	[new file with mode: 0644]	blob
src/irrlicht_changes/static_text.cpp		diff \| blob \| history
util/travis/clang-format-whitelist.txt		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.