summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlolo <lolo@web>2010-02-20 23:17:02 -0800
committerXCB site <xcb@freedesktop.org>2010-02-20 23:17:02 -0800
commit416ad5a20cb08e040bdb642a39123e8b2d9e2b69 (patch)
tree67ae682bb8ab5e1c04d36f277116c8580b2a6a6c
parent9b0b0400974ff3c264579ff0019c7629c202d332 (diff)
-rw-r--r--Publications.mdwn1
1 files changed, 0 insertions, 1 deletions
diff --git a/Publications.mdwn b/Publications.mdwn
index ed4bee6..441cab9 100644
--- a/Publications.mdwn
+++ b/Publications.mdwn
@@ -21,7 +21,6 @@ The authors are grateful to [[KeithPackard]] for his advice and assistance with
In addition, we thank the [Usenix](http://www.usenix.org) Association for their financial and staff support of ALS and the XFree86 Technical Conference. A Student Stipend awarded by the Usenix Association made it possible for Jamey to attend the 2001 XFree86 Technical Conference.
<<<<<<< HEAD:Publications.mdwn
-Finally, we are grateful to [Portland State University](http://www.pdx.edu) , the [College of Engineering and Computer Science](http://www.cecs.pdx.edu), and particularly the [Computer Science Department](http://www.cs.pdx.edu) for their support and forbearance during this work. Bart's travel expenses for the 2001 XFree86 Technical Conference and for Usenix 2002 were paid by the PSU CS Dept., making it possible for him to attend. The University is also currently providing the bandwidth and rack space to host [freedesktop.org](http://www.freedesktop.org), including this project. [HP](http://hp.com) has generously provided the machine hosting `freedesktop.org`. [http://www.asiawriters.com online writing jobs]
=======
Finally, we are grateful to [Portland State University](http://www.pdx.edu), the [College of Engineering and Computer Science](http://www.cecs.pdx.edu), and particularly the [Computer Science Department](http://www.cs.pdx.edu) for their support and forbearance during this work. Bart's travel expenses for the 2001 XFree86 Technical Conference and for Usenix 2002 were paid by the PSU CS Dept., making it possible for him to attend. The University is also currently providing the bandwidth and rack space to host [freedesktop.org](http://www.freedesktop.org), including this project. [HP](http://hp.com) has generously provided the machine hosting `freedesktop.org`.