Merge branch 'master' into DB1_C
commit554b6efec719e457527382c1db461a9988d3a973
authorRoger D. Peng [audrey] <rpeng@jhsph.edu>
Tue, 1 May 2007 12:57:30 +0000 (1 08:57 -0400)
committerRoger D. Peng [audrey] <rpeng@jhsph.edu>
Tue, 1 May 2007 12:57:30 +0000 (1 08:57 -0400)
tree154e2e5d64de2ee51f88764f211db2ac09796f2b
parent428b56ae2da42b6decd9a3b24c243c5ef003fefc
parenta9ea503dff4f2561705bc063c31b380b73eadc71
Merge branch 'master' into DB1_C

Conflicts:

DESCRIPTION
inst/doc/filehash.pdf
tests/reg-tests.Rout.save
There was a problem with the filehash.pdf vignette; will regenerate
NAMESPACE
R/filehash-DB1.R
inst/doc/filehash.pdf
tests/reg-tests.Rout.save