New commits:
commit b656bfdabce362f9fe31956e75b27b944211987f
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
adding forgotten entry for mpg123 spell
commit 365288760e6ddaef3ec0fe08da7789ca34f7d648
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
removing a scm leftover in ChangeLog
diff --git a/ChangeLog b/ChangeLog
index 06889ab..89ddaec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
2006-09-01 Alexander Tsamutali <astsmtl AT gmail.com>
* net/tcptraceroute: New spell, traceroute using TCP
+2006-08-31 Thomas Orgis <sobukus AT sourcemage.org>
+ * audio-players/mpg123: new spell (back from z-rejected)
+
2006-08-30 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* utils/hyperestraier: new spell
* http/xulrunner: new spell
@@ -34,7 +37,6 @@
2006-08-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* gurus.gpg: added my key
->>>>>>> origin
2006-08-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* disk/ddrescue: new spell, a data recovery tool
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (b656bfdabce362f9fe31956e75b27b944211987f),
Thomas Orgis, 09/03/2006