Merge branch 'mouse' of 93.90.177.129:zathura into mouse

Conflicts:
	config.def.h
	zathura.c
This commit is contained in:
Moritz Lipp 2010-05-18 01:03:08 +02:00
commit 742f687da6

View file

@ -418,6 +418,7 @@ init_zathura()
g_static_mutex_init(&(Zathura.Lock.search_lock)); g_static_mutex_init(&(Zathura.Lock.search_lock));
g_static_mutex_init(&(Zathura.Lock.pdf_obj_lock)); g_static_mutex_init(&(Zathura.Lock.pdf_obj_lock));
g_static_mutex_init(&(Zathura.Lock.select_lock)); g_static_mutex_init(&(Zathura.Lock.select_lock));
g_static_mutex_init(&(Zathura.Lock.select_lock));
/* look */ /* look */
gdk_color_parse(default_fgcolor, &(Zathura.Style.default_fg)); gdk_color_parse(default_fgcolor, &(Zathura.Style.default_fg));