From: Konrad Rosenbaum <konrad@silmor.de>
Date: Mon, 13 Feb 2012 20:54:04 +0000 (+0100)
Subject: Merge remote branch 'remotes/chester/master'
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=4750ca4eedb881a9f5625ef0133d6e2c91be78dd;p=web%2Fkonrad%2Ftaurus.git

Merge remote branch 'remotes/chester/master'
---

4750ca4eedb881a9f5625ef0133d6e2c91be78dd
diff --cc dptr/.gitignore
index 0000000,0000000..c14c196
new file mode 100644
--- /dev/null
+++ b/dptr/.gitignore
@@@ -1,0 -1,0 +1,11 @@@
++/html
++Makefile*
++tests/dptrtest
++*.exe
++*.dll
++*.a
++moc_*
++*.o
++*.obj
++*~
++*.bak