projects / people / teissler / ipfire-2.x.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cffed7a 67a1b5b)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 26 Jul 2011 06:12:05 +0000 (08:12 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 26 Jul 2011 06:12:05 +0000 (08:12 +0200)
commit8c4f3d176b15855e3da914569f669bfd70ff9253
tree098922dbe8b0a56c794224b9aacc3bafb0d884fetree | snapshot
parentcffed7aa4b730c3d961b6c135d9d7d9f3964b97ccommit | diff
parent67a1b5b843fab82cd0f185a11aeced596fb3c507commit | diff
Merge branch 'master' into next

Conflicts:
config/kernel/kernel.config.i586-ipfire-pae
config/rootfiles/core/45/meta
config/rootfiles/core/46/meta
config/rootfiles/core/47/meta
config/rootfiles/core/48/meta
config/rootfiles/core/52/meta
config/rootfiles/oldcore/44/meta
config/rootfiles/oldcore/45/meta
config/rootfiles/oldcore/46/meta
config/rootfiles/oldcore/47/meta
doc/language_missings
langs/pl/cgi-bin/pl.pl
make.sh
12 files changed:
doc/language_issues.de diff1 | diff2 | blob | history
doc/language_issues.en diff1 | diff2 | blob | history
doc/language_issues.es diff1 | diff2 | blob | history
doc/language_issues.fr diff1 | diff2 | blob | history
doc/language_issues.pl diff1 | diff2 | blob | history
doc/language_missings diff1 | diff2 | blob | history
langs/de/cgi-bin/de.pl diff1 | diff2 | blob | history
langs/en/cgi-bin/en.pl diff1 | diff2 | blob | history
langs/es/cgi-bin/es.pl diff1 | diff2 | blob | history
langs/fr/cgi-bin/fr.pl diff1 | diff2 | blob | history
langs/pl/cgi-bin/pl.pl diff1 | diff2 | blob | history
make.sh diff1 | diff2 | blob | history
Timo's tree of IPFire 2.x