# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1574027007 18000
# Node ID 526cc3926998ca4897ba3badeeb87903ca5ec165
# Parent  649ada124bdc0c4ec491da0c8dc0a8faf25ee9de# Parent  5a3902856597bf77121758b258738f54ac8c4afb
Merge.

diff -r 5a3902856597 -r 526cc3926998 eqclient.ini
--- a/eqclient.ini	Mon Nov 11 20:46:32 2019 -0500
+++ b/eqclient.ini	Sun Nov 17 16:43:27 2019 -0500
@@ -55,8 +55,8 @@
 WindowedModeXOffset=0
 WindowedModeYOffset=0
 Music=0
-SoundVolume=7
-Gamma=20.000000
+SoundVolume=1
+Gamma=20
 SpellParticleOpacity=0.480000
 EnvironmentParticleOpacity=1.000000
 ActorParticleOpacity=1.000000
@@ -535,7 +535,7 @@
 KEYMAPPING_PARTY5_1=1073741888
 KEYMAPPING_TARGETPC_1=1073741889
 KEYMAPPING_AUTORUN_1=43
-KEYMAPPING_SIT_STAND_2=44
+KEYMAPPING_SIT_STAND_2=0
 KEYMAPPING_SIT_STAND_1=44
 KEYMAPPING_TARGETNPC_2=0
 KEYMAPPING_CYCLENPCTARGETS_1=1073741867
@@ -545,3 +545,7 @@
 KEYMAPPING_HOT1_8_2=41
 KEYMAPPING_ZOOMIN_2=26
 KEYMAPPING_ZOOMOUT_2=27
+KEYMAPPING_HOT1_4_2=0
+KEYMAPPING_TARGETME_2=0
+KEYMAPPING_PARTY1_2=0
+KEYMAPPING_CYCLEREPLY_1=0
diff -r 5a3902856597 -r 526cc3926998 stumpwmrc
--- a/stumpwmrc	Mon Nov 11 20:46:32 2019 -0500
+++ b/stumpwmrc	Sun Nov 17 16:43:27 2019 -0500
@@ -543,7 +543,7 @@
 (define-top-keys ;; timers
   ("s-F7"  "tea-timer")
   ("s-F9"  "run-pop-timer")
-  ("s-F10" "set-pop-timer")
+  ("s-F8" "set-pop-timer")
   ("s-p"   "posture-start")
   ("s-P"   "posture-stop")
   ("s-y"   "posture-answer-yes")
diff -r 5a3902856597 -r 526cc3926998 vim/vimrc
--- a/vim/vimrc	Mon Nov 11 20:46:32 2019 -0500
+++ b/vim/vimrc	Sun Nov 17 16:43:27 2019 -0500
@@ -2121,6 +2121,7 @@
 
 nmap <leader>c <Plug>CommentaryLine
 xmap <leader>c <Plug>Commentary
+nmap <leader>C gcip
 
 augroup plugin_commentary
     au!