← Back to branch summary

~vcs-imports/ipfire/ipfire-2.x

~vcs-imports/ipfire/ipfire-2.x

« back to all changes in this revision

Viewing changes to langs/ru/cgi-bin

Committer: Arne Fitzenreiter
Date: 2011-08-09 03:49:10 UTC
mfrom: (2913.11.23)
Revision ID: git-v1:c7a2cfc817ff9f8524048bffacacded2a24b970b

Merge branch 'master' into next

Conflicts:
doc/language_missings

files added:
config/rootfiles/packages/nagios_nrpe

doc/language_issues.ru

langs/ru

langs/ru/cgi-bin

langs/ru/cgi-bin/ru.pl

langs/ru/install

langs/ru/install/lang_ru.c

lfs/nagios_nrpe

files removed:
src/patches/linux-2.6.32.43-cve_2011_1767+1768.patch

files modified:
config/rootfiles/common/configroot

config/rootfiles/core/50/filelists/files

config/rootfiles/core/51/filelists/files

config/rootfiles/core/52/filelists/files

config/rootfiles/packages/libmpdclient

doc/language_issues.de

doc/language_issues.en

doc/language_issues.es

doc/language_issues.fr

doc/language_issues.pl

doc/language_missings

langs/list

lfs/libmpdclient

lfs/linux

lfs/mpc

lfs/mpd

lfs/samba

make.sh

src/initscripts/init.d/console

src/install+setup/install/main.c

src/install+setup/libsmooth/main.c

src/install+setup/setup/main.c

tools/check_langs.sh

tools/make-functions

Show diffs side-by-side

added added

removed removed

langs/ru/cgi-bin

Older »