diff options
| author | Pierre Grandin <grandinp@gmail.com> | 2017-05-07 21:11:26 -0700 |
|---|---|---|
| committer | Pierre Grandin <grandinp@gmail.com> | 2017-05-07 21:11:26 -0700 |
| commit | 704a1417ed342d8d8e2d5e1391ac9d0934f7a975 (patch) | |
| tree | eae564bb2430ac5b26ce3b43018a5a72653dbde1 | |
| parent | e1f452002698fe96d47131e0bc514710dd65c90f (diff) | |
| download | navit-704a1417ed342d8d8e2d5e1391ac9d0934f7a975.tar.gz | |
Removed merge conflicts
| -rw-r--r-- | navit/plugin_def.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/navit/plugin_def.h b/navit/plugin_def.h index 09470a2c6..3ccf1eec3 100644 --- a/navit/plugin_def.h +++ b/navit/plugin_def.h @@ -23,17 +23,6 @@ struct callback_list; struct gui; PLUGIN_FUNC1(draw, struct container *, co) PLUGIN_FUNC3(popup, struct container *, map, struct popup *, p, struct popup_item **, list) -/* -<<<<<<< HEAD -PLUGIN_TYPE(graphics, (struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl)) -PLUGIN_TYPE(gui, (struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui)) -PLUGIN_TYPE(map, (struct map_methods *meth, struct attr **attrs, struct callback_list *cbl)) -PLUGIN_TYPE(osd, (struct navit *nav, struct osd_methods *meth, struct attr **attrs)) -PLUGIN_TYPE(speech, (struct speech_methods *meth, struct attr **attrs, struct attr *parent)) -PLUGIN_TYPE(vehicle, (struct vehicle_methods *meth, struct callback_list *cbl, struct attr **attrs)) -PLUGIN_TYPE(event, (struct event_methods *meth)) -PLUGIN_TYPE(font, (void *meth)) -=======*/ PLUGIN_CATEGORY(graphics, (struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl)) PLUGIN_CATEGORY(gui, (struct navit *nav, struct gui_methods *meth, struct attr **attrs, struct gui *gui)) PLUGIN_CATEGORY(map, (struct map_methods *meth, struct attr **attrs, struct callback_list *cbl)) @@ -43,4 +32,3 @@ PLUGIN_CATEGORY(vehicle, (struct vehicle_methods *meth, struct callback_list *cb PLUGIN_CATEGORY(event, (struct event_methods *meth)) PLUGIN_CATEGORY(audio, (struct audio_methods *meth, struct callback_list * cbl, struct attr **attrs, struct attr *parent)) PLUGIN_CATEGORY(font, (void *meth)) -//>>>>>>> navit/trunk |