Merge remote-tracking branch 'origin/develop' into develop

Superbil · Apr 18, 2012 · 1dd1e0d · 1dd1e0d
2 parents d745ab3 + 247e907
commit 1dd1e0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/99_alias b/99_alias
@@ -2,4 +2,3 @@
 #alias dev="cd ~/Development"
 alias amule='open -a aMule'
 alias screen='screen -RD'
-alias emacs="/usr/local/Cellar/emacs/23.4/Emacs.app/Contents/MacOS/Emacs -nw"
diff --git a/default_zkbd b/default_zkbd
@@ -27,3 +27,12 @@ key[Menu]=''
 key[C-A]='^A'
 key[C-E]='^E'
 key[C-D]='^D'
+key[C-F]='^F'
+key[C-B]='^B'
+key[C-N]='^N'
+key[C-P]='^P'
+
+key[C-R]='^R'
+
+key[C-K]='^K'
+key[C-U]='^U'