New commits:
commit ebdc6a6414482f54b4fac181bca73c86e22d1987
Author: Anton Brondz <dinolinux AT sourcemage.org>
Commit: Anton Brondz <dinolinux AT sourcemage.org>
-==== YOURS HISTORY
->>>> ORIGINAL HISTORY#1
-2003-06-25 hgg <hgreig AT bigpond.net.au>
-==== THEIRS HISTORY#2
-<<<<
-2005-01-31 Maurizio Boriani <baux AT sourcemage.org>
-==== YOURS HISTORY
-2003-06-25 hgg <hgreig AT bigpond.net.au>
- * Update to 0.31 and update website
-<<<<
->>>> ORIGINAL HISTORY#1
- Update to 0.31 and update website
-==== THEIRS HISTORY#2
- * DETAILS: Upgrade to release 0.40 and fixed url.
-==== YOURS HISTORY
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-<<<<
-
->>>> ORIGINAL HISTORY#1
-2002-10-14 Julian v. Bock <julian AT wongr.net>
-==== THEIRS HISTORY#2
-2003-06-25 hgg <hgreig AT bigpond.net.au>
- * Update to 0.31 and update website
-==== YOURS HISTORY
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-<<<<
->>>> ORIGINAL HISTORY#1
-
- * DETAILS: add LICENSE and MD5 fields.
-
-2002-10-14 Julian v. Bock <julian AT wongr.net>
-
- * DETAILS: add LICENSE and MD5 fields.
-==== THEIRS HISTORY#2
-
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-
-==== YOURS HISTORY
-
-<<<<
2003-06-25 hgg <hgreig AT bigpond.net.au>
* Update to 0.31 and update website
2002-10-14 Julian v. Bock <julian AT wongr.net>
* DETAILS: add LICENSE and MD5 fields.
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-
-2003-06-25 hgg <hgreig AT bigpond.net.au>
- * Update to 0.31 and update website
-
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-
-2003-06-25 hgg <hgreig AT bigpond.net.au>
- * Update to 0.31 and update website
-
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-
-2002-10-14 Julian v. Bock <julian AT wongr.net>
- * DETAILS: add LICENSE and MD5 fields.
-
[SM-Commit] GIT changes to master grimoire by Anton Brondz (ebdc6a6414482f54b4fac181bca73c86e22d1987),
Anton Brondz, 08/23/2006