diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 12:05:38 +0200 |
| commit | 033e30653835c5c3fc785ab60e6a110203e6241d (patch) | |
| tree | fbb575df1204e3d44fd1262af721bae206fc848e /Config.in | |
| parent | 8f3142f161895b5fb02c12d1a4a6e5eec8e861d6 (diff) | |
resolve merge
Diffstat (limited to 'Config.in')
| -rw-r--r-- | Config.in | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -104,8 +104,8 @@ choice prompt "Kernel Version" default ADK_KERNEL_VERSION_3_14_4 -config ADK_KERNEL_VERSION_3_15_RC5 - prompt "3.15-rc5" +config ADK_KERNEL_VERSION_3_15_RC6 + prompt "3.15-rc6" boolean config ADK_KERNEL_VERSION_3_14_4 @@ -143,7 +143,7 @@ endchoice config ADK_KERNEL_VERSION string - default "3.15-rc5" if ADK_KERNEL_VERSION_3_15_RC5 + default "3.15-rc6" if ADK_KERNEL_VERSION_3_15_RC6 default "3.14.4" if ADK_KERNEL_VERSION_3_14_4 default "3.13.11" if ADK_KERNEL_VERSION_3_13_11 default "3.12.20" if ADK_KERNEL_VERSION_3_12_20 |