From: Michael Georgoulopoulos <mgeorgoulopoulos@gmail.com>
Date: Sat, 15 Oct 2016 21:44:43 +0000 (+0300)
Subject: Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=commitdiff_plain;h=864abe83bf0aef3c7a1b7f9f4ef0d89fc1fe80ef;hp=aa228f8b7d6c5848d3d34fdd673371a5c797ddfb

Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo
---

diff --git a/.gitignore b/.gitignore
index f957445..09296a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,5 @@ data
 *.CFG
 *.cfg
 *.$$$
+
+/dosdemo.vcxproj.user