Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-forhasu

README.md

@@ -54,6 +54,9 @@ You can find some keyboard specific projects under `converter` and `keyboard` di
 * [KMAC](keyboard/kmac/)                    - Korean custom keyboard
 * [Lightsaber](keyboard/lightsaber/)        - Korean custom keyboard
 * [Infinity](keyboard/infinity/)            - Massdrop [Infinity keyboard][Infinity]
+* [NerD](keyboard/nerd/)                    - Korean custom keyboard
+* [KittenPaw](keyboard/kittenpaw)           - Custom Majestouch controller
+* [Lightpad](keyboard/lightpad)             - Korean custom keypad
 
 [GH_macway]:    http://geekhack.org/showwiki.php?title=Island:11930
 [GH_hhkb]:      http://geekhack.org/showwiki.php?title=Island:12047

common/command.c

@@ -216,7 +216,7 @@ static bool command_common(uint8_t code)
             print("C> ");
             command_state = CONSOLE;
             break;
-        case KC_PAUSE:
+        case KC_B:
             clear_keyboard();
             print("\n\nJump to bootloader... ");
             _delay_ms(1000);