[freehaven-cvs] push freehaven-cvs changes that have been sitting in...

[arma@xxxxxxxx]

Update of /home/freehaven/cvsroot/doc
In directory moria:/home/arma/work/freehaven/doc

Modified Files:
	freehaven.bib 
Log Message:
push freehaven-cvs changes that have been sitting in my
sandbox over the years


Index: freehaven.bib
===================================================================
RCS file: /home/freehaven/cvsroot/doc/freehaven.bib,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- freehaven.bib	4 Jul 2000 23:47:49 -0000	1.42
+++ freehaven.bib	28 Nov 2006 04:46:25 -0000	1.43
@@ -1,4 +1,3 @@
-<<<<<<< freehaven.bib
 @INPROCEEDINGS{JSI96,
   author = {Markus Jakobsson and Kazue Sako and Russell Impagliazzo},
   title = {Designated Verifier Proofs and Their Applications},

***********************************************************************
To unsubscribe, send an e-mail to majordomo@xxxxxxxx with
unsubscribe freehaven-cvs       in the body. http://freehaven.net/