From a6ee28ca37621098ed040e6d1c4ae103934c3e97 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 15 Mar 2004 18:03:22 -0800 Subject: [PATCH] resolve conflicts darcs-hash:20040316020322-5007d-d249c4b1b737ad522ea42337846a7c0d7d2d05c2.gz --- doc/nestedvm.ivme04.tex | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/nestedvm.ivme04.tex b/doc/nestedvm.ivme04.tex index 789c774..31d1481 100644 --- a/doc/nestedvm.ivme04.tex +++ b/doc/nestedvm.ivme04.tex @@ -21,11 +21,13 @@ Running Legacy C/C++ Libraries in a Pure Java Environment }}} \date{} \author{\begin{tabular}{@{}c@{}} - {\em {Brian Alliet}} \\ \\ - {{\it RIT}}\relax + {\em {Brian Alliet}} \\ + {Rochester Institute of Technology}\\ + {\tt brian@ibex.org} \end{tabular}\hskip 1in\begin{tabular}{@{}c@{}} - {\em {Adam Megacz}} \\ \\ - {UC Berkeley}\relax + {\em {Adam Megacz}} \\ + {UC Berkeley Statistical Computing Facility} \\ + {\tt adam@ibex.org} \end{tabular}} \begin{document} -- 1.7.10.4