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

resolve merge conflicts of 364e42e to master

Browse Source 
Change-Id: I0d742baa230d2d55b34de4f4a7a441dfb214d133
This commit is contained in:
Ian Pedowitz
2016-06-03 13:00:18 -07:00
parent 68bcb1ff4c 364e42edae
commit 4a0723af3c
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

@@ -75,7 +75,7 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
# This is all of the development codenames that are active. Should be either # This is all of the development codenames that are active. Should be either
# the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional
# codenames after PLATFORM_VERSION_CODENAME. # codenames after PLATFORM_VERSION_CODENAME.
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),NMR1 PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),NMR1,N
endif endif
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"