Merge branch 'master' of github.com:/crh0831/dotfiles

.dosbox/dosbox-0.74.conf

@@ -24,7 +24,8 @@
 fullscreen=false
 fulldouble=false
 fullresolution=original
-windowresolution=1024x576
+#windowresolution=1024x576
+windowresolution=1280x960
 output=overlay
 autolock=true
 sensitivity=100

.gitconfig

@@ -21,3 +21,6 @@
         default = simple
 [color]
 	ui = true
+[user]
+	name = chawley (hannibal)
+	email = chawley@planethawleywood.com

Makefile

@@ -9,6 +9,7 @@ softlinks: dependencies
 	@test -L ${HOME}/.gitconfig || ln -s ${HOME}/dotfiles/.gitconfig ${HOME}/.gitconfig
 	@test -L ${HOME}/.abcde.conf || ln -s ${HOME}/dotfiles/.abcde.config ${HOME}/.abcde.conf
 	@test -L ${HOME}/.conkyrc || ln -s ${HOME}/dotfiles/.conkyrc ${HOME}/.conkyrc
+	@test -L ${HOME}/.crawlrc || ln -s ${HOME}/dotfiles/.crawlrc ${HOME}/.crawlrc
 	@test -L ${HOME}/.dosbox || ln -s ${HOME}/dotfiles/.dosbox ${HOME}/.dosbox
 	@test -L ${HOME}/.ssh/config || ln -s ${HOME}/dotfiles/.ssh/config ${HOME}/.ssh/config
 	@test -L ${HOME}/.gitconfig || ln -s ${HOME}/dotfiles/.gitconfig ${HOME}/.gitconfig
@@ -16,7 +17,7 @@ softlinks: dependencies
 
 
 gitconfig: dependencies softlinks
-	git config --global user.name "${USER} (${HOSTNAME})"
+	git config --global user.name "${USER} (${HOST})"
 	git config --global user.email chawley@planethawleywood.com
 
 dependencies: