Author |
Committer |
Branch |
Timestamp |
Parent |
|
pstorz |
pstorz |
master |
2018-01-26 13:35 |
master 0431c9c3 |
Pending |
Changeset |
Merge branch 'pstorz/tls-psk-manually-merged-into-master' of ueberschar.de:bareos into pstorz/tls-psk-manually-merged-into-master |
mod - src/lib/CMakeLists.txt |
Diff File |
mod - src/lib/bsock.cc |
Diff File |
mod - src/lib/lib.h |
Diff File |
mod - src/lib/parse_conf.cc |
Diff File |
mod - src/lib/parse_conf.h |
Diff File |
add - src/lib/tls_conf.cc |
Diff File |
add - src/lib/tls_conf.h |
Diff File |
mod - src/qt-tray-monitor/authenticate.cpp |
Diff File |
mod - src/qt-tray-monitor/authenticate.h |
Diff File |
mod - src/qt-tray-monitor/monitoritem.cpp |
Diff File |
mod - src/qt-tray-monitor/tray_conf.h |
Diff File |