Merge branch 'master' of pwmt.org:zathura

Conflicts:
	config.mk
This commit is contained in:
Moritz Lipp 2010-08-01 13:39:53 +02:00
commit 33fa15c92a
3 changed files with 4 additions and 5 deletions

View File

@ -1,7 +1,7 @@
# See LICENSE file for license and copyright information
# zathura make config
VERSION = 0.0.8
VERSION = 0.0.8.1
# paths
PREFIX ?= /usr

View File

@ -93,7 +93,7 @@ Reload the document
Change goto mode (L: search labels, D: default, O: manual offset)
.TP
.B ^i
Invert the colors of the page
Recolors the page
.TP
.B i
Change to insert mode
@ -225,4 +225,5 @@ change and adjust all the settings of zathura according to your wishes.
In addition you can create a zathurarc file (default path: ~/.config/zathura/zathurarc)
to overwrite settings and keybindings by using the set and map function. For
more information please check the faq on the website: http://pwmt.org/zathura
more information please check the faq on the website:
http://pwmt.org/projects/zathura

View File

@ -1409,8 +1409,6 @@ read_configuration_file(const char* rcfile)
cmd_set(length - 1, tokens + 1);
else if(!strcmp(tokens[0], "map"))
cmd_map(length - 1, tokens + 1);
g_strfreev(tokens);
}
g_strfreev(lines);