2 files changed, 18 insertions(+), 8 deletions(-)

M series
M shiv.config
M series +3 -3
@@ 4,7 4,7 @@ new_master
 statuscolours
 cycle
 push
-fibonacci #-block
-shiv.config #-block
+fibonacci
+shiv.config
 centurion.config #-block
-veles.config
+veles.config #-block

          
M shiv.config +15 -5
@@ 1,9 1,18 @@ 
 # HG changeset patch
-# Parent 7f05bb99c89e2a17acfc9ff4114e42c1b56663a8
+# Parent 968c9ff015807846610d502ff367b90842dd8c46
 
-diff -r 7f05bb99c89e config.def.h
---- a/config.def.h	Wed Jan 09 14:56:06 2013 +1300
-+++ b/config.def.h	Thu May 09 21:47:29 2013 +1200
+diff -r 968c9ff01580 config.def.h
+--- a/config.def.h	Fri Sep 20 08:55:52 2013 +1200
++++ b/config.def.h	Fri Oct 25 16:41:34 2013 +1300
+@@ -1,7 +1,7 @@
+ /* See LICENSE file for copyright and license details. */
+ 
+ /* appearance */
+-static const char font[]            = "Dejavu Sans Mono:medium:size=10.5";
++static const char font[]            = "Dejavu Sans Mono:medium:size=7.5";
+ #define NUMCOLORS 9 
+ static const char colors[NUMCOLORS][ColLast][9] = {
+ // border foreground background
 @@ -31,7 +31,8 @@
     { "Skype",       NULL,       NULL,       1 << 0,       True,        -1 },
     { "Filezilla",   NULL,       NULL,       1 << 0,       True,        -1 },

          
@@ 31,7 40,7 @@ diff -r 7f05bb99c89e config.def.h
  static const char   *lockcmd[] = { "xautolock", "-locknow", NULL };
  static const char *rebootcmd[] = { "systemctl", "reboot", NULL };
  static const char   *shutcmd[] = { "systemctl", "poweroff", NULL };
-@@ -115,6 +117,11 @@
+@@ -115,6 +117,12 @@
  	{ MODKEY,                       XK_Right,  cycle,          {.i = +1 } },
  	{ MODKEY|ControlMask,           XK_Left,   tagcycle,       {.i = -1 } },
  	{ MODKEY|ControlMask,           XK_Right,  tagcycle,       {.i = +1 } },

          
@@ 40,6 49,7 @@ diff -r 7f05bb99c89e config.def.h
 +	{ 0,                            0x1008ff13,spawn,          SHCMD("$HOME/Scripts/volume up") },
 +	{ 0,                            0x1008ff03,spawn,          SHCMD("$HOME/Scripts/brightness down") },
 +	{ 0,                            0x1008ff02,spawn,          SHCMD("$HOME/Scripts/brightness up") },
++	{ 0,                            0x1008ff59,spawn,          SHCMD("$HOME/Scripts/touchpad") },
  	TAGKEYS(                        XK_1,                      0)
  	TAGKEYS(                        XK_2,                      1)
  	TAGKEYS(                        XK_3,                      2)