dotfiles/.gitmodules

[submodule "dotfiles/emacs.d"]
	path = dotfiles/emacs.d
	url = https://github.com/IvanMalison/.emacs.d.git
[submodule "dotfiles/vim/bundle/vundle"]
	path = dotfiles/vim/bundle/vundle
	url = https://github.com/gmarik/Vundle.vim.git
Initial commit. Conflicts: .gitmodules dotfiles/lib/shellrc/aliases.sh 2014-04-08 06:17:22 -06:00			`[submodule "dotfiles/emacs.d"]`
			`path = dotfiles/emacs.d`
Get rid of tasks.sh Bump emacs.d for emacs jedi stuff 2014-10-10 05:00:19 -06:00			`url = https://github.com/IvanMalison/.emacs.d.git`
Add vundle submodule. 2014-08-25 21:11:15 -06:00			`[submodule "dotfiles/vim/bundle/vundle"]`
			`path = dotfiles/vim/bundle/vundle`
			`url = https://github.com/gmarik/Vundle.vim.git`