Merge branch 'master'

This commit is contained in:
David Capello 2016-12-20 17:05:35 -03:00
commit 6ceab26240
2 changed files with 3 additions and 1 deletions

View File

@ -451,6 +451,8 @@ if(NOT USE_STATIC_LIBC)
endif()
set(LAF_WITH_TESTS ${ENABLE_TESTS} CACHE BOOL "Enable LAF tests")
set(UNDO_TESTS ${ENABLE_TESTS} CACHE BOOL "Enable undo tests")
add_subdirectory(laf)
add_subdirectory(src)

2
laf

@ -1 +1 @@
Subproject commit 42ad03a9a30ebe619674aaf07ef27cf442133903
Subproject commit e6d79aa2ef6fe032f05e75386398667b084e0ec5