Merge branch 'search'
authorFlorian Forster <ff@octo.it>
Sat, 19 Jun 2010 06:06:50 +0000 (08:06 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 19 Jun 2010 06:06:50 +0000 (08:06 +0200)
commit2c85f876c1b9d5c161694cfb03cf20773b74c844
treeb5a43318d825dc684c76fe62c15107c28c9d718f
parentda630143f2fd8a152ec71a9c7ed8b0ae17081fa4
parente850a3c5fb03dcb0e8698e61db2fd01a845bc6cf
Merge branch 'search'

Conflicts:
src/graph_def.c
src/graph_ident.h
src/graph_instance.h
12 files changed:
src/Makefile.am
src/action_list_graphs.c
src/graph.c
src/graph.h
src/graph_def.c
src/graph_def.h
src/graph_ident.h
src/graph_instance.c
src/graph_instance.h
src/graph_list.c
src/graph_list.h
src/graph_types.h