]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commit
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Feb 2016 18:45:08 +0000 (19:45 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Feb 2016 18:47:50 +0000 (19:47 +0100)
commit802b916d10aa314ae878ec633e7c3bbd2adaba7e
treedfeda839c91fbc7b449b864c3e0b9d39bf37535d
parent879458d41f95578cd35e0f8e9f9e5078aa8dccbb
parent1ffbca6e4f3fdb0fbde2e725ba066877cb7f909e
Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Conflicts:
make.sh
config/rootfiles/core/99/exclude
config/rootfiles/oldcore/98/exclude
config/rootfiles/oldcore/98/filelists/armv5tel/glibc
config/rootfiles/oldcore/98/filelists/files
config/rootfiles/oldcore/98/filelists/i586/glibc
config/rootfiles/oldcore/98/filelists/x86_64/glibc
config/rootfiles/oldcore/98/meta
config/rootfiles/oldcore/98/update.sh
lfs/glibc
make.sh