Merge branch 'f-multi-retrieve' into f-update
Showing
- CHANGELOG.md 0 additions, 2 deletionsCHANGELOG.md
- CMakeLists.txt 2 additions, 2 deletionsCMakeLists.txt
- include/caosdb/configuration.h 4 additions, 3 deletionsinclude/caosdb/configuration.h
- include/caosdb/entity.h 0 additions, 1 deletioninclude/caosdb/entity.h
- proto 1 addition, 1 deletionproto
- src/caosdb/entity.cpp 0 additions, 7 deletionssrc/caosdb/entity.cpp
- test/CMakeLists.txt 1 addition, 1 deletiontest/CMakeLists.txt
- test/test_configuration.cpp 2 additions, 5 deletionstest/test_configuration.cpp
- test/test_connection.cpp 1 addition, 2 deletionstest/test_connection.cpp
- test/test_entity.cpp 4 additions, 8 deletionstest/test_entity.cpp
- test/test_protobuf.cpp 2 additions, 4 deletionstest/test_protobuf.cpp
- test/test_transaction.cpp 1 addition, 2 deletionstest/test_transaction.cpp
Loading
Please register or sign in to comment