Merge branch 'master' into DB1_C
commit9479413e1317a20e76e92c868fc06986a2bf3959
authorRoger D. Peng [audrey] <rpeng@jhsph.edu>
Tue, 10 Apr 2007 13:17:02 +0000 (10 09:17 -0400)
committerRoger D. Peng [audrey] <rpeng@jhsph.edu>
Tue, 10 Apr 2007 13:17:02 +0000 (10 09:17 -0400)
tree3f15f36576053da124a0df896a5e44bc91fa6dad
parent9305c7d86268eaacb4f746281a3f885dc654c0c6
parent06f8deae1c9f428154884442b822902ff1aa6efc
Merge branch 'master' into DB1_C

Conflicts:

DESCRIPTION
R/filehash-DB1.R
inst/doc/filehash.pdf
tests/reg-tests.Rout.save
Merge in changes to filehash-DB1 class.
R/filehash-DB1.R
inst/doc/filehash.pdf
tests/reg-tests.Rout.save