tweak
Merge branch 'master' of https://github.com/davidaq/ccplus
Merge branch 'master' of https://github.com/davidaq/ccplus
Merge branch 'master' of https://github.com/davidaq/ccplus

Conflicts:
	test/test.gtest.cpp
gif
Add freetype dependency
Implemented a prototype for text renderable
gif
fixing still
Implemented a basic text renderable
Fix conflict
fix some bug
Merge branch 'master' of http://git2.niven.cn/ccplus
Merge branch 'master' of https://github.com/davidaq/ccplus
Implemented the text renderable
split ae_export to multiple files
Add OpenGL dependency
Nice GPU
export text & track matte
Merge branch 'master' of http://git2.niven.cn/ccplus

Conflicts:
	src/renderables/text-renderable.cpp