Merge remote branch 'remotes/chester/master'

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

diff --cc dptr/dptr.h
Simple merge

diff --cc dptr/dptr_shared.h
Simple merge