WIP: Merge manually
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- DEPENDENCIES.md 2 additions, 2 deletionsDEPENDENCIES.md
- include/caosdb/connection.h 3 additions, 0 deletionsinclude/caosdb/connection.h
- include/caosdb/entity.h 2 additions, 0 deletionsinclude/caosdb/entity.h
- include/caosdb/exceptions.h 12 additions, 22 deletionsinclude/caosdb/exceptions.h
- include/caosdb/log_level.h 2 additions, 2 deletionsinclude/caosdb/log_level.h
- include/caosdb/logging.h 37 additions, 6 deletionsinclude/caosdb/logging.h
- include/caosdb/message_code.h 7 additions, 3 deletionsinclude/caosdb/message_code.h
- include/caosdb/transaction_status.h 8 additions, 3 deletionsinclude/caosdb/transaction_status.h
- src/caosdb/configuration.cpp 5 additions, 3 deletionssrc/caosdb/configuration.cpp
- src/caosdb/logging.cpp 7 additions, 0 deletionssrc/caosdb/logging.cpp
Loading
Please register or sign in to comment