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

@ -1,14 +1,16 @@
bin_PROGRAMS = task
task_SOURCES = Att.cpp Cmd.cpp Color.cpp Config.cpp Context.cpp Date.cpp \
Directory.cpp Duration.cpp File.cpp Filter.cpp Grid.cpp \
Keymap.cpp Location.cpp Nibbler.cpp Path.cpp Permission.cpp \
Record.cpp Sequence.cpp StringTable.cpp Subst.cpp TDB.cpp \
Table.cpp Task.cpp Timer.cpp command.cpp custom.cpp edit.cpp \
import.cpp interactive.cpp main.cpp recur.cpp report.cpp \
rules.cpp text.cpp util.cpp \
Att.h Cmd.h Color.h Config.h Context.h Date.h Directory.h \
Duration.h File.h Filter.h Grid.h Keymap.h Location.h \
Nibbler.h Path.h Permission.h Record.h Sequence.h \
task_SHORTNAME = t
task_SOURCES = API.cpp Att.cpp Cmd.cpp Color.cpp Config.cpp Context.cpp \
Date.cpp Directory.cpp Duration.cpp File.cpp Filter.cpp \
Grid.cpp Hooks.cpp Keymap.cpp Location.cpp Nibbler.cpp \
Path.cpp Permission.cpp Record.cpp Sequence.cpp \
StringTable.cpp Subst.cpp TDB.cpp Table.cpp Task.cpp Timer.cpp \
command.cpp custom.cpp edit.cpp import.cpp interactive.cpp \
main.cpp recur.cpp report.cpp rules.cpp text.cpp util.cpp \
API.h Att.h Cmd.h Color.h Config.h Context.h Date.h \
Directory.h Duration.h File.h Filter.h Grid.h Hooks.h Keymap.h \
Location.h Nibbler.h Path.h Permission.h Record.h Sequence.h \
StringTable.h Subst.h TDB.h Table.h Task.h Timer.h i18n.h \
main.h text.h util.h
task_CPPFLAGS=$(LUA_CFLAGS)
task_LDFLAGS=$(LUA_LFLAGS)