projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
lib
/
config.h
diff --git
a/src/lib/config.h
b/src/lib/config.h
index 99b3eb62122e00529502db5100f5e069a35c4c3e..3cc7c49c463950f8300fac0085266ae9b6df8fad 100644
(file)
--- a/
src/lib/config.h
+++ b/
src/lib/config.h
@@
-435,7
+435,7
@@
public:
private:
Config ();
- boost::filesystem::path file (
bool
) const;
+ boost::filesystem::path file () const;
void read ();
void write () const;
void make_decryption_keys ();