diff options
| author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
|---|---|---|
| committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
| commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
| tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/FileUtil.hh | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/FileUtil.hh')
| -rw-r--r-- | src/FbTk/FileUtil.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/FileUtil.hh b/src/FbTk/FileUtil.hh index fea1c1f..d031a6e 100644 --- a/src/FbTk/FileUtil.hh +++ b/src/FbTk/FileUtil.hh | |||
| @@ -58,7 +58,7 @@ namespace FileUtil { | |||
| 58 | /// copies file 'from' to 'to' | 58 | /// copies file 'from' to 'to' |
| 59 | bool copyFile(const char* from, const char* to); | 59 | bool copyFile(const char* from, const char* to); |
| 60 | 60 | ||
| 61 | }; // end of File namespace | 61 | } // end of File namespace |
| 62 | 62 | ||
| 63 | /// Wrapper class for DIR * routines | 63 | /// Wrapper class for DIR * routines |
| 64 | class Directory : private FbTk::NotCopyable { | 64 | class Directory : private FbTk::NotCopyable { |