Merge branch 'hooks' into 1.9.0

Conflicts:
	src/command.cpp
	src/report.cpp
This commit is contained in:
Paul Beckingham 2010-01-27 22:46:20 -05:00
commit 585cbdfcac
17 changed files with 1592 additions and 409 deletions

View file

@ -36,6 +36,7 @@
#include "Task.h"
#include "TDB.h"
#include "StringTable.h"
#include "Hooks.h"
class Context
{
@ -90,6 +91,7 @@ public:
std::map <std::string, std::string> aliases;
std::vector <std::string> tagAdditions;
std::vector <std::string> tagRemovals;
Hooks hooks;
private:
std::vector <std::string> headers;