public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, core83, updated. 9a0ba6de9658ef0faaa1df279f1712a009409eab
@ 2014-09-26  9:16 git
  0 siblings, 0 replies; only message in thread
From: git @ 2014-09-26  9:16 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 1821 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core83 has been updated
       via  9a0ba6de9658ef0faaa1df279f1712a009409eab (commit)
      from  61466ab18dff0dc9809578f2e5d810a6a16d9aa4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9a0ba6de9658ef0faaa1df279f1712a009409eab
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Sep 26 04:13:45 2014 +0200

    fix merge problem.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/82/filelists/iputils        | 1 -
 config/rootfiles/core/82/filelists/openssl-compat | 1 -
 2 files changed, 2 deletions(-)
 delete mode 120000 config/rootfiles/core/82/filelists/iputils
 delete mode 120000 config/rootfiles/core/82/filelists/openssl-compat

Difference in files:
diff --git a/config/rootfiles/core/82/filelists/iputils b/config/rootfiles/core/82/filelists/iputils
deleted file mode 120000
index 361c28f..0000000
--- a/config/rootfiles/core/82/filelists/iputils
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/iputils
\ No newline at end of file
diff --git a/config/rootfiles/core/82/filelists/openssl-compat b/config/rootfiles/core/82/filelists/openssl-compat
deleted file mode 120000
index c9fa421..0000000
--- a/config/rootfiles/core/82/filelists/openssl-compat
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openssl-compat
\ No newline at end of file


hooks/post-receive
--
IPFire 2.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2014-09-26  9:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-26  9:16 [git.ipfire.org] IPFire 2.x development tree branch, core83, updated. 9a0ba6de9658ef0faaa1df279f1712a009409eab git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox