git.pond.sub.org Git - empserver/commit

]> git.pond.sub.org Git - empserver/commit

author	Markus Armbruster <armbru@pond.sub.org>
	Tue, 12 Apr 2011 20:07:10 +0000 (22:07 +0200)
committer	Markus Armbruster <armbru@pond.sub.org>
	Tue, 12 Apr 2011 20:17:21 +0000 (22:17 +0200)
commit	d8bef8e80603678ebf0d13bf64680b1769c210ef
tree	992157389094764850be0a912f14b6d17e812231	tree \| snapshot
parent	fc0c65864653c4af0220537ddb71d24aa6088de0	commit \| diff
parent	04363a92db7e80942c03f9dee6edca88cc3536eb	commit \| diff

Merge branch 'pathfind' into pathfind-test

Conflicts:
src/lib/as/as_cache.c
src/lib/as/as_stats.c
src/lib/common/path.c

Modified:
modified:   include/path.h
modified:   include/prototypes.h
modified:   src/lib/update/finish.c

include/path.h	diff1 \|	diff2 \|	blob \| history
src/lib/common/path.c	diff1 \|	diff2 \|	blob \| history
src/lib/update/finish.c	diff1 \|	diff2 \|	blob \| history

Markus's Wolfpack Empire tree

RSS Atom

include/path.h	diff1 \|	diff2 \|	blob \| history
src/lib/common/path.c	diff1 \|	diff2 \|	blob \| history
src/lib/update/finish.c	diff1 \|	diff2 \|	blob \| history