Commit Graph

7 Commits

Author SHA1 Message Date
David Capello
fd445e01f9 Add third_party/gtest as a submodule 2015-05-29 11:08:47 -03:00
David Capello
4f365e4ac2 Adjust simpleini submodule URL 2014-10-30 11:34:35 -03:00
David Capello
cd2531855f Merge branch '1.0'
Conflicts:
	.gitmodules
2014-10-30 11:33:09 -03:00
David Capello
01c26e5a18 Adjust pixman submodule URL 2014-10-30 10:03:46 -03:00
David Capello
39b8e034b5 Merge branch '1.0'
Conflicts:
	.gitmodules
	CMakeLists.txt
	src/CMakeLists.txt
	src/app/app.h
	src/app/app_menus.cpp
	src/app/commands/cmd_move_mask.cpp
	src/app/commands/cmd_rotate.cpp
	src/app/modules/gui.cpp
	src/doc/resize_image_tests.cpp
	src/ui/accelerator.cpp
	third_party/CMakeLists.txt
2014-10-30 01:06:27 -03:00
David Capello
0cf597c0f4 Add dependency with pixman library 2014-10-25 22:22:58 -03:00
David Capello
2b2d0f34b2 Add simpleini to replace Allegro 4 configuration routines 2014-10-16 21:27:25 -03:00