Merge pull request #8 from Daft-Freak/patch-2

author Michael Sartain <mikesart@gmail.com>

Fri, 14 Mar 2014 15:52:48 +0000 (08:52 -0700)

committer Carl Worth <cworth@cworth.org>

Tue, 1 Apr 2014 18:46:36 +0000 (11:46 -0700)
author Michael Sartain <mikesart@gmail.com>
Fri, 14 Mar 2014 15:52:48 +0000 (08:52 -0700)
committer Carl Worth <cworth@cworth.org>
Tue, 1 Apr 2014 18:46:36 +0000 (11:46 -0700)
diff --git a/.gitignore b/.gitignore

index 7cef4f781e40c7a5e5bcbe5582a4ac7e32d0bf8a..cf0d3c1183deb85bd732200c97ec2e918566c80e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ bin/i386/mkvogl
  bin/i386/steamlauncher
  vogl_build/*
  vogl_extbuild/*
+
+*~
author	Michael Sartain <mikesart@gmail.com>
	Fri, 14 Mar 2014 15:52:48 +0000 (08:52 -0700)
committer	Carl Worth <cworth@cworth.org>
	Tue, 1 Apr 2014 18:46:36 +0000 (11:46 -0700)