aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core/common/action_layer.c
diff options
context:
space:
mode:
authorGravatar Stephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-04-18 08:03:22 +0200
committerGravatar Stephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-04-18 08:03:22 +0200
commit9cc39156f7ac696c4561a8fa4e01bbcc9addc53e (patch)
treeaf166a966b16bb1714551265965b3660fa0c26ba /tmk_core/common/action_layer.c
parent6732d6cf1a3268ece981c6b0c07a1b9e0f61adbe (diff)
parentd94960be5b32b6a4019b822550ae09cf802bfcd7 (diff)
downloadqmk_firmware-9cc39156f7ac696c4561a8fa4e01bbcc9addc53e.tar.gz
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core/common/action_layer.c')
-rw-r--r--tmk_core/common/action_layer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c
index e817c0d51..845fbbb21 100644
--- a/tmk_core/common/action_layer.c
+++ b/tmk_core/common/action_layer.c
@@ -4,14 +4,14 @@
#include "util.h"
#include "action_layer.h"
-#ifdef DEBUG_ACTION
+//#ifdef DEBUG_ACTION
#include "debug.h"
-#else
-#include "nodebug.h"
-#endif
+//#else
+//#include "nodebug.h"
+//#endif
-/*
+/*
* Default Layer State
*/
uint32_t default_layer_state = 0;
@@ -52,7 +52,7 @@ void default_layer_xor(uint32_t state)
#ifndef NO_ACTION_LAYER
-/*
+/*
* Keymap Layer State
*/
uint32_t layer_state = 0;