sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (66605849ac91ddf6eb1837f003d117fcdae3ea7a)

From: Bor Kraljič <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (66605849ac91ddf6eb1837f003d117fcdae3ea7a)
Date: Wed, 31 Aug 2011 02:28:14 -0500

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 1 -
1 files changed, 1 deletion(-)

New commits:
commit 66605849ac91ddf6eb1837f003d117fcdae3ea7a
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

ChangeLog: ups. I should be more carefull when resolving conflicts :)

diff --git a/ChangeLog b/ChangeLog
index 472fc9a..c5df47f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,6 @@
* audio-soft/freepats: new spell, midi patchset
* audio-players/eawpats: deprecated in favour of freepats
* audio-players/wildmidi: new spell, simple midi synth
->>>>>>> master

2011-08-28 Vlad Glagolev <stealth AT sourcemage.org>
* gnu.gpg: added public key 4AE55E93 (Tristan Gingold

[SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (66605849ac91ddf6eb1837f003d117fcdae3ea7a), Bor Kraljič, 08/31/2011