From: Chris Porter <redacted>
Date: Thu, 19 Jun 2008 20:16:37 +0000 (+0100)
Subject: Merge.
X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/commitdiff_plain/bb10a39304627cfec718196d042b4c2b11b31701

Merge.
---

bb10a39304627cfec718196d042b4c2b11b31701
diff --cc compile.sh
index 0000000,6bed33b..6bed33b
mode 000000,100755..100644
--- a/compile.sh
+++ b/compile.sh
diff --cc run.sh
index 0000000,78ee921..78ee921
mode 000000,100755..100644
--- a/run.sh
+++ b/run.sh