Merge branch 'maint'

Conflicts:
	src/calcurse.h
	src/io.c
This commit is contained in:
Lukas Fleischer
2011-11-11 12:29:48 +01:00
5 changed files with 20 additions and 7 deletions

View File

@@ -100,6 +100,9 @@
#define DPID_PATH DIR_NAME DPID_PATH_NAME
#define NOTES_DIR DIR_NAME NOTES_DIR_NAME
#define DEFAULT_EDITOR "vi"
#define DEFAULT_PAGER "less"
#define ATTR_FALSE 0
#define ATTR_TRUE 1
#define ATTR_LOWEST 2