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/LogicCommands.cc | |
| 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/LogicCommands.cc')
| -rw-r--r-- | src/FbTk/LogicCommands.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/LogicCommands.cc b/src/FbTk/LogicCommands.cc index e1ea5b8..b3abe31 100644 --- a/src/FbTk/LogicCommands.cc +++ b/src/FbTk/LogicCommands.cc | |||
| @@ -77,7 +77,7 @@ REGISTER_COMMAND_PARSER(and, parseLogicCommand, bool); | |||
| 77 | REGISTER_COMMAND_PARSER(or, parseLogicCommand, bool); | 77 | REGISTER_COMMAND_PARSER(or, parseLogicCommand, bool); |
| 78 | REGISTER_COMMAND_PARSER(xor, parseLogicCommand, bool); | 78 | REGISTER_COMMAND_PARSER(xor, parseLogicCommand, bool); |
| 79 | 79 | ||
| 80 | }; // end anonymous namespace | 80 | } // end anonymous namespace |
| 81 | 81 | ||
| 82 | Command<void> *IfCommand::parse(const std::string &command, const std::string &args, | 82 | Command<void> *IfCommand::parse(const std::string &command, const std::string &args, |
| 83 | bool trusted) { | 83 | bool trusted) { |