gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Feature - merge command

Browse Source 
- Merged patch that implements the first milestone of the merge
  feature.  Thanks to Johannes Schlatow.
This commit is contained in:
Paul Beckingham
2010-07-01 20:22:33 -04:00
parent d7c446f010
commit 213a7a519b
12 changed files with 800 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Makefile.am
View File

@@ -4,13 +4,14 @@ 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 export.cpp import.cpp \
interactive.cpp main.cpp recur.cpp report.cpp rules.cpp rx.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 rx.h
StringTable.cpp Subst.cpp TDB.cpp Table.cpp Task.cpp \
Taskmod.cpp Timer.cpp command.cpp custom.cpp edit.cpp \
export.cpp import.cpp interactive.cpp main.cpp recur.cpp \
report.cpp rules.cpp rx.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 Taskmod.h Timer.h i18n.h main.h text.h \
util.h rx.h
task_CPPFLAGS=$(LUA_CFLAGS)
task_LDFLAGS=$(LUA_LFLAGS)