From: Priyadi Iman Nurcahyo <priyadi@priyadi.net>
Date: Mon, 13 Feb 2017 11:01:57 +0000 (+0700)
Subject: Merge branch 'faux_clicky' into promethium
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=75e57b4bcb4f97fea7ed1b011eea3557a6b3e041;p=qmk_firmware.git

Merge branch 'faux_clicky' into promethium
---

75e57b4bcb4f97fea7ed1b011eea3557a6b3e041
diff --cc keyboards/planck/keymaps/priyadi/keymap.c
index 80e867621,13668fd10..2c215702b
--- a/keyboards/planck/keymaps/priyadi/keymap.c
+++ b/keyboards/planck/keymaps/priyadi/keymap.c
@@@ -310,6 -259,18 +310,10 @@@ const uint32_t PROGMEM unicode_map[] = 
    [FSIGM] = 0x03C2,
  };
  
 -
 -// hybrid shift - =
 -// #undef KC_LSFT
 -// #define KC_LSFT MT(MOD_LSFT, KC_MINS)
 -// #undef KC_RSFT
 -// #define KC_RSFT MT(MOD_LSFT, KC_EQL)
 -
 -
+ // hybrid right-gui & scroll lock (mapped to Compose in OS)
+ #undef KC_RALT
+ #define KC_RALT MT(MOD_RALT, KC_SLCK)
+ 
  // keymaps
  
  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {