StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 24cfbfa to lmp-dev

Browse Source 
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
This commit is contained in:
Zach Jang
2016-06-21 18:13:17 -07:00
parent 79770b1927 24cfbfabb7
commit 12db224269
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/version_defaults.mk
View File

@@ -73,7 +73,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
# Can be an arbitrary string, but must be a single word. # Can be an arbitrary string, but must be a single word.
# #
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2015-11-01 PLATFORM_SECURITY_PATCH := 2016-08-05
endif endif
ifeq "" "$(PLATFORM_BASE_OS)" ifeq "" "$(PLATFORM_BASE_OS)"