# HG changeset patch
# User Edho Prima Arief <me@myconan.net>
# Date 1296970666 -25200
# Node ID fe9c15fe739a733dc8d045febecebc2ee525f58b
# Parent  9381a0c8f3f0afd4315ee96b9389781ebe64f847# Parent  5db1b912f66b8383cb5a6e53484447f714f08c6a
Branch merge.

diff -r 5db1b912f66b -r fe9c15fe739a hg
--- a/hg	Sun Jan 23 00:07:11 2011 +0700
+++ b/hg	Sun Feb 06 12:37:46 2011 +0700
@@ -8,3 +8,7 @@
 
 [extensions]
 hgext.convert = 
+hgext.bookmarks =
+hgext.rebase =
+hggit =
+
diff -r 5db1b912f66b -r fe9c15fe739a tmux
--- a/tmux	Sun Jan 23 00:07:11 2011 +0700
+++ b/tmux	Sun Feb 06 12:37:46 2011 +0700
@@ -15,9 +15,9 @@
 set -g status-utf8 on
 setw -g utf8 on
 
-set -g pane-border-bg black
-set -g pane-border-fg white
-set -g pane-active-border-bg black
+#set -g pane-border-bg black
+#set -g pane-border-fg white
+#set -g pane-active-border-bg black
 set -g pane-active-border-fg blue
 
 set -g set-titles on