Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'develop'

  • Loading branch information...
commit 40b5c80d38245afba636c6cc9eec5d05cfc2e352 2 parents d9c24ea + eafa63e
@kdopen kdopen authored
View
6 CMakeLists.txt
@@ -1,6 +1,6 @@
# @@@LICENSE
#
-# Copyright (c) 2010-2013 LG Electronics, Inc.
+# Copyright (c) 2010-2014 LG Electronics, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -25,10 +25,10 @@ cmake_minimum_required(VERSION 2.8.7)
project(nyx)
set(NYX_API_VERSION_MAJOR 6)
-set(NYX_API_VERSION_MINOR 0)
+set(NYX_API_VERSION_MINOR 1)
include(webOS/webOS)
-webos_modules_init(1 0 0 QUALIFIER RC5)
+webos_modules_init(1 0 0 QUALIFIER RC7)
webos_component(${NYX_API_VERSION_MAJOR} ${NYX_API_VERSION_MINOR} 0)
set(NYX_LIB_ROOT ${WEBOS_INSTALL_LIBDIR}/nyx CACHE PATH "Nyx internal executables install root path")
View
8 include/public/nyx/common/nyx_os_info_common.h
@@ -1,6 +1,6 @@
/* @@@LICENSE
*
-* Copyright (c) 2013 LG Electronics
+* Copyright (c) 2013-2014 LG Electronics
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -53,7 +53,11 @@ typedef enum {
NYX_OS_INFO_WEBOS_IMAGENAME,
NYX_OS_INFO_WEBOS_API_VERSION,
NYX_OS_INFO_WEBOS_PRERELEASE,
- NYX_OS_INFO_MANUFACTURING_VERSION
+ NYX_OS_INFO_MANUFACTURING_VERSION,
+ // NYX_OS_INFO_MANUFACTURING_VERSION will be deprecated,
+ // use NYX_OS_INFO_WEBOS_MANUFACTURING_VERSION instead
+ NYX_OS_INFO_WEBOS_MANUFACTURING_VERSION = NYX_OS_INFO_MANUFACTURING_VERSION,
+ NYX_OS_INFO_ENCRYPTION_KEY_TYPE
}
nyx_os_info_query_t;
Please sign in to comment.
Something went wrong with that request. Please try again.