Merge commit 'origin/master' into next

Conflicts:
	src/paks/linux-pae/uninstall.sh
This commit is contained in:
Arne Fitzenreiter
2010-10-23 13:34:53 +02:00
2 changed files with 3 additions and 1 deletions

View File

@@ -11,6 +11,8 @@
#usr/local/doc/cmake-2.4/cmake.txt
#usr/local/doc/cmake-2.4/ctest.html
#usr/local/doc/cmake-2.4/ctest.txt
#usr/local/man
#usr/local/man/man1
#usr/local/man/man1/ccmake.1
#usr/local/man/man1/cmake.1
#usr/local/man/man1/ctest.1