[from now] 2014/08/11 14:53:57

diff --git a/.gnuplot b/.gnuplot
index 62cb5d4..6952b1a 100644
--- a/.gnuplot
+++ b/.gnuplot
@@ -1,6 +1,6 @@
 reset

-set terminal x11 enhanced font ',10' persist
+set terminal x11 enhanced font ',10' # persist
 # set terminal pngcairo size 640,360 enhanced font 'DejaVuSansMono,8'
 # set output "output.png"

@@ -28,8 +28,20 @@ set style line 7 lc rgb '#FDBF6F' lw 2 pt 6 ps 1 # light orange
 set style line 8 lc rgb '#FF7F00' lw 2 pt 6 ps 1 # dark orange
 set style line 9 lc rgb '#666666' lw 2 pt 6 ps 1 # gray

+# # line styles
+# set style line 1 lc rgb '#A6CEE3' lw 2 pt 6 ps 1 # light blue
+# set style line 2 lc rgb '#1F78B4' lw 2 pt 6 ps 1 # dark blue
+# set style line 3 lc rgb '#B2DF8A' lw 2 pt 6 ps 1 # light green
+# set style line 4 lc rgb '#33A02C' lw 2 pt 6 ps 1 # dark green
+# set style line 5 lc rgb '#FB9A99' lw 2 pt 6 ps 1 # light red
+# set style line 6 lc rgb '#E31A1C' lw 2 pt 6 ps 1 # dark red
+# set style line 7 lc rgb '#FDBF6F' lw 2 pt 6 ps 1 # light orange
+# set style line 8 lc rgb '#FF7F00' lw 2 pt 6 ps 1 # dark orange
+# set style line 9 lc rgb '#666666' lw 2 pt 6 ps 1 # gray
+
 # # matlab palette
-set palette maxcolors 8
+# set palette maxcolors 8
+set cbtics scale 0
 set palette defined ( 0 "#000090",\
                       1 "#000fff",\
                       2 "#0090ff",\
[from now] 2014/08/11 14:55:23

diff --git a/.bashrc b/.bashrc
index 0f4245f..edff127 100644
--- a/.bashrc
+++ b/.bashrc
@@ -19,7 +19,6 @@ export GREP_COLOR='1;36'
 export PS1='\[\033[1;32m\]\u@\h\[\033[0m\] \[\033[1;34m\]\w\[\033[0m\] \$ '
 export CLICOLOR=1
 export LSCOLORS=ExFxCxDxBxegedabagacad
-export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 #}}}

diff --git a/.gnuplot b/.gnuplot
index 6952b1a..1a6fdcd 100644
--- a/.gnuplot
+++ b/.gnuplot
@@ -1,8 +1,14 @@
 reset

+<<<<<<< HEAD
 set terminal x11 enhanced font ',10' # persist
 # set terminal pngcairo size 640,360 enhanced font 'DejaVuSansMono,8'
 # set output "output.png"
+=======
+# set terminal x11 enhanced font ',10' persist
+set terminal pngcairo size 640,360 enhanced font 'DejaVuSansMono,8'
+set output "plot.png"
+>>>>>>> 92e7926771d6ba34a41248581355c1ac972145c4

 set label "gnuplot" at screen 0.987,0.99 rotate by -90 font ",6" textcolor rgb "#808080"

diff --git a/.vimrc b/.vimrc
index e83e3cf..5918d0d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -88,18 +88,15 @@ Bundle 'zefei/buftabs'
 Bundle 'hirono/vimdoc_ja'
 Bundle 'vim-scripts/mru.vim'
 Bundle 'vim-scripts/sudo.vim'
-Bundle 'vim-scripts/taglist.vim'
 Bundle 'vim-scripts/AutoComplPop'
 Bundle 'Shougo/vimproc.vim'
 Bundle 'Shougo/unite.vim'
 Bundle 'Shougo/vimfiler.vim'
 Bundle 'thinca/vim-qfreplace'
-Bundle 'mattn/zencoding-vim'
 Bundle 'tomtom/tcomment_vim'
 Bundle 'godlygeek/tabular'
 Bundle 'banyan/recognize_charcode.vim'
 Bundle 'tomasr/molokai'
-Bundle 'kchmck/vim-coffee-script'
 Bundle 'nathanaelkane/vim-indent-guides'

 filetype plugin indent on
@@ -217,12 +214,10 @@ nnoremap            <C-k><C-i> :set paste!<CR>
 nnoremap            <C-k><C-m> :w<CR>:!make -B<CR>
 nnoremap            <C-k><C-p> :bp<CR>
 nnoremap            <C-k><C-n> :bn<CR>
-nnoremap  <silent>  <C-k><C-d> :call g:wipeout_tlist_buffer()<CR>:bw!<CR>:<C-u>Tlist<CR>
+nnoremap            <C-k><C-d> :bw!<CR>
 nnoremap            <C-k><C-k> @s
 nnoremap            s          q
-nnoremap  <silent>  q          :call g:wipeout_tlist_buffer()<CR>:bw!<CR>:<C-u>Tlist<CR>
-" nnoremap  <silent>  q          :call g:wipeout_tlist_buffer()<CR>:bw!<CR>
-" nnoremap            q          :close<CR>
+nnoremap            q          :bw!<CR>
 nnoremap            ;          :
 nnoremap            ,          <C-w><C-w>
 nnoremap            -          20<C-w>+
@@ -269,18 +264,18 @@ vnoremap    <Space>t         :Tab/

 "****************************************
 " taglist
-nnoremap <silent> <Space>r  :<C-u>Tlist<CR>
-let Tlist_Show_One_File      = 1
-let Tlist_Exit_OnlyWindow    = 1
-let Tlist_Enable_Fold_Column = 1
-let Tlist_Auto_Open          = 0
-let Tlist_Auto_Update        = 1
-let Tlist_WinWidth           = 70
-function! g:wipeout_tlist_buffer()
-  if bufexists('__Tag_List__')
-    :bw! __Tag_List__
-  endif
-endfunction
+" nnoremap <silent> <Space>r  :<C-u>Tlist<CR>
+" let Tlist_Show_One_File      = 1
+" let Tlist_Exit_OnlyWindow    = 1
+" let Tlist_Enable_Fold_Column = 1
+" let Tlist_Auto_Open          = 0
+" let Tlist_Auto_Update        = 1
+" let Tlist_WinWidth           = 70
+" function! s:wipeout_tlist_buffer()
+"   if bufexists('__Tag_List__')
+"     :bw! __Tag_List__
+"   endif
+" endfunction

 "****************************************
diff --git a/README.md b/README.md
index f6eb186..c4c2473 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 .dotfiles
 =========

+