sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (9725fb420c3068be390a81d8494c25efaeb3c4c2)

From: Pol Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (9725fb420c3068be390a81d8494c25efaeb3c4c2)
Date: Mon, 30 Apr 2007 18:35:03 -0500

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

ChangeLog | 2 --
1 files changed, 2 deletions(-)

New commits:
commit 9725fb420c3068be390a81d8494c25efaeb3c4c2
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

ChangeLog: forgot to remove conflicts marks

diff --git a/ChangeLog b/ChangeLog
index 364e7b3..a517247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,8 +81,6 @@
* perl-cpan/config-tiny: new spell, Config::Tiny - Read/Write .ini
style
files with as little code as possible

-=======
->>>>>>> 5a90497099149604a18c48c8a7cf8ccaca0344c0:ChangeLog
2007-04-25 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* libs/c-ares: new spell, asynchronous DNS resolver library,
can be used by curl, bzflag, aria2, tor and others

[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (9725fb420c3068be390a81d8494c25efaeb3c4c2), Pol Vinogradov, 04/30/2007