| Author |
Committer |
Branch |
Timestamp |
Parent |
|
| franku |
franku |
dev |
2018-09-20 19:32 |
dev d5d4bd18 |
Pending |
|
|
Changeset |
rebase master: corrected some merge errors |
| mod - core/src/console/CMakeLists.txt |
Diff File |
| mod - core/src/console/console_conf.cc |
Diff File |
| mod - core/src/console/console_output.cc |
Diff File |
| mod - core/src/dird/CMakeLists.txt |
Diff File |
| mod - core/src/dird/auth_pam.cc |
Diff File |
| mod - core/src/dird/dird_conf.cc |
Diff File |
| mod - core/src/dird/ua.cc |
Diff File |
| mod - core/src/dird/ua.h |
Diff File |
| mod - core/src/dird/ua_cmdstruct.h |
Diff File |
| mod - core/src/dird/ua_output.h |
Diff File |
| mod - core/src/dird/ua_server.cc |
Diff File |
| mod - core/src/lib/CMakeLists.txt |
Diff File |
| mod - core/src/lib/unittests/CMakeLists.txt |
Diff File |
