« back to all changes in this revision
Viewing changes to make.sh
- 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
Conflicts:
doc/language_missings
- files added:
- config/rootfiles/packages/nagios_nrpe
- langs/ru
- langs/ru/cgi-bin
- langs/ru/install
- files removed:
- src/patches/linux-2.6.32.43-cve_2011_1767+1768.patch
- files modified:
- config/rootfiles/common/configroot
added
removed
make.sh
