Skip to Content.
Sympa Menu

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

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 (020fd6ffdf3a229a5ef58c34c8a32046cfc2056c)
  • Date: Sat, 25 May 2019 15:38:41 +0000

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

archive/rpm/HISTORY | 1 -
ruby-raa/gnome-art/HISTORY | 3 ---
video/mplayer/HISTORY | 1 -
3 files changed, 5 deletions(-)

New commits:
commit 020fd6ffdf3a229a5ef58c34c8a32046cfc2056c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

rpm: correct HISTORY file

commit 4e61d26f634dd5a9b0cebba6486b2b68f6372ba2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mplayer: correct HISTORY file

commit df5eabb5f195809bb86b70b659e754de5c975517
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gnome-art: correct HISTORY file

diff --git a/archive/rpm/HISTORY b/archive/rpm/HISTORY
index 528fb9e..f00f2d6 100644
--- a/archive/rpm/HISTORY
+++ b/archive/rpm/HISTORY
@@ -90,7 +90,6 @@
* DETAILS, DEPENDS, PRE_BUILD: use gcc 3.4, bug #12754
* PRE_BUILD: fixed target dir in python Makefiles

->>>>>>> .merge_file_NXJa26
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/ruby-raa/gnome-art/HISTORY b/ruby-raa/gnome-art/HISTORY
index db18bbe..627cb0d 100644
--- a/ruby-raa/gnome-art/HISTORY
+++ b/ruby-raa/gnome-art/HISTORY
@@ -1,9 +1,6 @@
-<<<<<<< HEAD:ruby-raa/gnome-art/HISTORY
-=======
2008-01-12 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* INSTALL: uses setup.sh

->>>>>>> e085a55975f5251faca1b575d63fd33f50a43ee2:ruby-raa/gnome-art/HISTORY
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index dd356c7..6db6d56 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -163,7 +163,6 @@

2007-11-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, libavformat-api.patch: fix to support latest ffmpeg-svn
->>>>>>> c9f8f246c7ebcf92c330c4ab45b87ddf334f1c86:video/mplayer/HISTORY

2007-10-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: removed the MPLAYER_SVN check around the live dependency,



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (020fd6ffdf3a229a5ef58c34c8a32046cfc2056c), Vlad Glagolev, 05/25/2019

Archive powered by MHonArc 2.6.24.

Top of Page