Merge branch 'master' into DB1_C
commit19d8311538748ab0106e4df4c16a6fc15b150d07
authorRoger D. Peng [audrey] <rpeng@jhsph.edu>
Fri, 7 Sep 2007 13:10:53 +0000 (7 09:10 -0400)
committerRoger D. Peng [audrey] <rpeng@jhsph.edu>
Fri, 7 Sep 2007 13:10:53 +0000 (7 09:10 -0400)
tree73fc871dfbf5b39489fe2c7f244f76e9bb2dccea
parent4cfba49fca2e287a40fbf126c473ec2ae140a1a2
parent0fd7742a2b897971ea2e1c4f311b11489d0d64da
Merge branch 'master' into DB1_C

* master:
  Update PDF vignette
  Update regression test output
  Remove section about cleaning up with dbDisconnect
  Bump version/date
  Update regression test output
  Revert "Remove dbDisconnect calls from dbReorganize; add regression test"
  Remove dbDisconnect calls from dbReorganize; add regression test
  Remove dbDisconnect calls from dbReorganize; add regression test
  Use packageStartupMessage and bump R version

Conflicts:

inst/doc/filehash.pdf
tests/reg-tests.Rout.save
R/filehash-DB1.R
R/zzz.R
inst/doc/filehash.pdf
tests/reg-tests.Rout.save