Merge remote branch 'remotes/chester/master'
authorKonrad Rosenbaum <konrad@silmor.de>
Mon, 13 Feb 2012 20:43:00 +0000 (21:43 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Mon, 13 Feb 2012 20:43:00 +0000 (21:43 +0100)
1  2 
dptr/.gitignore
dptr/dptr.h
dptr/dptr_shared.h

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