diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-17 18:15:35 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-17 18:15:35 -0400 |
| commit | e0ab1dcf4c6e97b81e4ea4c2521163e6917ef838 (patch) | |
| tree | b50d32f3d08965a3967ad78cf65490e63e894a13 /tmk_core/common/action_macro.c | |
| parent | ce463ef424c5bd26b84ead7de5f31eab366f98eb (diff) | |
| parent | 23231fa577f7c6c585124226a83f21a7668e62dd (diff) | |
| download | qmk_firmware-e0ab1dcf4c6e97b81e4ea4c2521163e6917ef838.tar.gz qmk_firmware-e0ab1dcf4c6e97b81e4ea4c2521163e6917ef838.zip | |
merging
Diffstat (limited to 'tmk_core/common/action_macro.c')
| -rw-r--r-- | tmk_core/common/action_macro.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/common/action_macro.c b/tmk_core/common/action_macro.c index 7726b1190..cc78c8232 100644 --- a/tmk_core/common/action_macro.c +++ b/tmk_core/common/action_macro.c | |||
| @@ -19,11 +19,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 19 | #include "action_macro.h" | 19 | #include "action_macro.h" |
| 20 | #include "wait.h" | 20 | #include "wait.h" |
| 21 | 21 | ||
| 22 | #ifdef DEBUG_ACTION | 22 | //#ifdef DEBUG_ACTION |
| 23 | #include "debug.h" | 23 | #include "debug.h" |
| 24 | #else | 24 | //#else |
| 25 | #include "nodebug.h" | 25 | //#include "nodebug.h" |
| 26 | #endif | 26 | //#endif |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | #ifndef NO_ACTION_MACRO | 29 | #ifndef NO_ACTION_MACRO |