Changes to be committed:
	modified:   tmux.conf
Changes to be committed:
	new file:   tmux/tmux-resurrect/resurrect.tmux
	new file:   tmux/tmux-resurrect/scripts/check_tmux_version.sh
	new file:   tmux/tmux-resurrect/scripts/helpers.sh
	new file:   tmux/tmux-resurrect/scripts/process_restore_helpers.sh
	new file:   tmux/tmux-resurrect/scripts/restore.sh
	new file:   tmux/tmux-resurrect/scripts/save.sh
	new file:   tmux/tmux-resurrect/scripts/spinner_helpers.sh
	new file:   tmux/tmux-resurrect/scripts/tmux_spinner.sh
	new file:   tmux/tmux-resurrect/scripts/variables.sh
	new file:   tmux/tmux-resurrect/strategies/irb_default_strategy.sh
	new file:   tmux/tmux-resurrect/strategies/vim_session.sh
Changes to be committed:
	new file:   tmux/resurrect/last
	new file:   tmux/resurrect/tmux_resurrect_2014-09-04T17:52:41.txt
Merge branch 'master' of github.com:horosgrisa/dotfiles

Conflicts:
	tmux.conf
Changes to be committed:
	modified:   tmux.conf