Merge branch 'www-restyle'
Conflicts: doc/developer/developer.xml doc/www-data/index.html doc/www-data/index.ru.html
Showing
- .gitignore 3 additions, 0 deletions.gitignore
- CMakeLists.txt 4 additions, 0 deletionsCMakeLists.txt
- doc/CMakeLists.txt 1 addition, 0 deletionsdoc/CMakeLists.txt
- doc/developer/CMakeLists.txt 1 addition, 1 deletiondoc/developer/CMakeLists.txt
- doc/user/CMakeLists.txt 3 additions, 3 deletionsdoc/user/CMakeLists.txt
- doc/www-data.in/CMakeLists.txt 4 additions, 0 deletionsdoc/www-data.in/CMakeLists.txt
- doc/www-data.in/_config 11 additions, 0 deletionsdoc/www-data.in/_config
- doc/www-data.in/_ignore 7 additions, 0 deletionsdoc/www-data.in/_ignore
- doc/www-data.in/_layout/base 44 additions, 0 deletionsdoc/www-data.in/_layout/base
- doc/www-data.in/_layout/benchmark 2 additions, 0 deletionsdoc/www-data.in/_layout/benchmark
- doc/www-data.in/_layout/docs 2 additions, 0 deletionsdoc/www-data.in/_layout/docs
- doc/www-data.in/_layout/download 2 additions, 0 deletionsdoc/www-data.in/_layout/download
- doc/www-data.in/_layout/faq 2 additions, 0 deletionsdoc/www-data.in/_layout/faq
- doc/www-data.in/_layout/home 53 additions, 0 deletionsdoc/www-data.in/_layout/home
- doc/www-data.in/_layout/intro 2 additions, 0 deletionsdoc/www-data.in/_layout/intro
- doc/www-data.in/_layout/script 13 additions, 0 deletionsdoc/www-data.in/_layout/script
- doc/www-data.in/benchmark 6 additions, 0 deletionsdoc/www-data.in/benchmark
- doc/www-data.in/docs 27 additions, 0 deletionsdoc/www-data.in/docs
- doc/www-data.in/download.cmake 159 additions, 0 deletionsdoc/www-data.in/download.cmake
- doc/www-data.in/faq 67 additions, 0 deletionsdoc/www-data.in/faq
Loading
Please register or sign in to comment