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

2 files changed, 2 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index cdba88c..41b85c7 100644
--- a/Makefile
+++ b/Makefile
@@ -65,4 +65,4 @@ mutt:
         ln -sf `pwd`/muttrc ~/.config/mutt/muttrc
 
 tmux:
-        ln -sf `pwd`misc/tmux.conf ~/.tmux.conf
+        ln -sf `pwd`/misc/tmux.conf ~/.tmux.conf
diff --git a/alias b/alias
index a1da25f..c1ebbc5 100644
--- a/alias
+++ b/alias
@@ -11,6 +11,7 @@ alias muttrc='vim ~/.config/mutt/muttrc'
 alias gitconfig='vim ~/.gitconfig'
 alias sshconfig='vim ~/.ssh/config'
 alias cdconfig='cd ~/config'
+alias txconfig='vim ~/.tmux.conf'
 alias log="cat $SETTING_DIR/log | grep '`date +'%b %d'`'"
 alias xa='xargs'