summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlolo <lolo@web>2010-02-20 23:15:50 -0800
committerXCB site <xcb@freedesktop.org>2010-02-20 23:15:50 -0800
commit69713395cc8642c07d3c7d65054964b041a376f1 (patch)
tree553a65519ba6d6aff17e2da7d34527d5859064ba
parent9c1e622e038ea1b082a4bea7852dd186d8d59e8d (diff)
-rw-r--r--Publications.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/Publications.mdwn b/Publications.mdwn
index d7306e4..8508b75 100644
--- a/Publications.mdwn
+++ b/Publications.mdwn
@@ -23,5 +23,5 @@ In addition, we thank the [Usenix](http://www.usenix.org) Association for their
<<<<<<< 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)[online writing jobs](http://www.asiawriters.com) , 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`.
+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`.
>>>>>>> a78511a1a7a9870ef6858e03635ac9cf2ef9890d:Publications.mdwn