Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=bf1afe7cb7ff6736a5470ac1ce77181fbaa65fb0

commit bf1afe7cb7ff6736a5470ac1ce77181fbaa65fb0
Merge: a29ad8f be84022
Author: Baste <[email protected]>
Date:   Thu Nov 7 09:42:04 2013 +0100

Merge ../current

Conflicts:
source/apps/docbook-xsl/FrugalBuild
source/apps/docbook-xsl/docbook-xsl.install

diff --cc source/apps/docbook-xsl/docbook-xsl.install
index 50abcd7,baaccba..1f7c308
--- a/source/apps/docbook-xsl/docbook-xsl.install
+++ b/source/apps/docbook-xsl/docbook-xsl.install
@@@ -35,3 -35,5 +35,6 @@@ post_remove()
op=$1
shift
$op $*
+
+
++
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to