diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-12-01 22:40:44 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-12-01 22:40:44 +0100 |
| commit | f9c58f3bf71a7ce1a2fbbb04a7f9766735522778 (patch) | |
| tree | 644e1c222f7ce8d5190a357d5da6e13a1edb50f3 /test/core/client_config/set_initial_connect_string_test.c | |
| parent | cf42611b39b08fc4e9864a5e1b37bcfeef8522bb (diff) | |
| parent | 3e5cbee777cfd1d05f1161dfb97093878c7e48ed (diff) | |
Merge branch 'release-0_12'
Conflicts:
src/core/security/credentials.c
test/core/security/credentials_test.c
Diffstat (limited to 'test/core/client_config/set_initial_connect_string_test.c')
0 files changed, 0 insertions, 0 deletions