Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (250861d0ab7562aad3d22a045a4cddfbf07d578c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (250861d0ab7562aad3d22a045a4cddfbf07d578c)
  • Date: Thu, 24 Dec 2015 07:58:37 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 250861d0ab7562aad3d22a045a4cddfbf07d578c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

fixed post-conflict state in ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4f106e4..e916a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -550,7 +550,6 @@
2015-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-multimedia/dragon: spell deprecated [replaced by
kde5-mm/dragon]

-<<<<<<< HEAD
2015-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-lts/kdepim: spell deprecated [replaced by kde5-pim/kdepim]
* kde5-pim/*: added
@@ -565,10 +564,9 @@

2015-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* kde4-support/akonadi: spell deprecated [replaced by
dke5-pim/akonadi]
-=======
+
2015-07-28 Ismael Luceno <ismael AT sourcemage.org>
* graphics-libs/libpng12: new spell, copied from libpng 1.2.52 spell
->>>>>>> origin/master

2015-07-24 Vlad Glagolev <stealth AT sourcemage.org>
* http/palemoon: new spell, Open Source, Firefox-based web browser



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (250861d0ab7562aad3d22a045a4cddfbf07d578c), Vlad Glagolev, 12/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page