]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
fix merge problem.
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 11:44:26 +0000 (13:44 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 11:44:26 +0000 (13:44 +0200)
commit416bf5f3f9c24b5b7e57d07e5aec0cbff1e249a6
tree8e12c0e2d2090a58ead87841148066eb4e41fd2c
parent61466ab18dff0dc9809578f2e5d810a6a16d9aa4
fix merge problem.
config/rootfiles/oldcore/82/filelists/iputils [moved from config/rootfiles/core/82/filelists/iputils with 100% similarity]
config/rootfiles/oldcore/82/filelists/openssl-compat [moved from config/rootfiles/core/82/filelists/openssl-compat with 100% similarity]