# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1220215931 -7200
# Node ID 6d36a36a01c6bdd3d221860d026efe0d20760d88
# Parent  189ffdd944b47b5a44c3382ab6690a913c9ac400# Parent  e1c34d251e395566bf2df8ce81ee35651af7d398
Merge main and crew

diff -r e1c34d251e39 -r 6d36a36a01c6 mcabber/CodingStyle.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mcabber/CodingStyle.txt	Sun Aug 31 22:52:11 2008 +0200
@@ -0,0 +1,33 @@
+This document describes the preferred coding style for the mcabber project.
+
+If you intend to patch and contribute to mcabber, please try to use the
+existing style, and read the following points.
+
+- Do not use tabs, use space characters;
+- Avoid trailing whitespace;
+- Avoid lines longer than 80 characters;
+- Indentation is 2 spaces (ok, maybe it isn't a good idea but it's the
+  current style);
+- Put a space after non-functions statements (e.g. if, while...)
+- Put the opening brace last on the same line, and put the closing brace first
+  except for functions, where the opening brace should be alone on a new line.
+
+  Example:
+
+    void example(void)
+    {
+      if (cond1) {
+        do_a();
+      } else if (cond2) {
+        do_b();
+      } else {
+        do_c();
+      }
+
+      if (error)
+        exit(0);
+    }
+
+ - Look at existing code for rules not mentioned here.
+
+Mikael