Skip to content
Commit 98cc40a4 authored by Roland Olbricht's avatar Roland Olbricht
Browse files

Merge branch 'redesign_dispatcher' 

Conflicts:
	src/Makefile.am
	src/template_db/types.h
	src/test-bin/Makefile.am
parents f848a90e ccc87a2c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment