Merge branch 'master' into UI2

This commit is contained in:
Cameron Gutman 2016-02-16 12:26:28 -05:00
commit a7e4440cd7
2 changed files with 2 additions and 2 deletions

View File

@ -28,4 +28,4 @@ COMMON_C_SOURCE := \
COMMON_C_INCLUDE := $(COMMON_C_DIR) $(OPENAES_INCLUDE)
COMMON_C_C_FLAGS := -Wno-missing-braces
COMMON_C_C_FLAGS := -DLC_CHROME -Wno-missing-braces

@ -1 +1 @@
Subproject commit 21ec3f027041f7f14e3bd7daba062638dd96aa26
Subproject commit ca870694bad271c57c855d9a849b5732db3bed0e