hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'develop' into next

Browse Source
This commit is contained in:
Sebastian Messmer 2016-06-28 01:38:12 -07:00
commit 9e1d466eee
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/cryfs-cli/program_options/ParserTest.cpp
View File

@ -1,6 +1,7 @@
#include "testutils/ProgramOptionsTestBase.h" #include "testutils/ProgramOptionsTestBase.h"
#include <cryfs-cli/program_options/Parser.h> #include <cryfs-cli/program_options/Parser.h>
#include <cryfs/config/CryCipher.h> #include <cryfs/config/CryCipher.h>
#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
using namespace cryfs; using namespace cryfs;
using namespace cryfs::program_options; using namespace cryfs::program_options;

1
test/gitversion/ParserTest.cpp
View File

@ -1,6 +1,5 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gitversion/parser.h> #include <gitversion/parser.h>
#include <cpp-utils/pointer/unique_ref_boost_optional_gtest_workaround.h>
using namespace gitversion; using namespace gitversion;