summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormetalstrolch <stefan.wildemann@metalstrolche.de>2019-08-20 22:04:31 +0200
committermetalstrolch <stefan.wildemann@metalstrolche.de>2019-08-20 22:04:31 +0200
commit54dc6b71661a9368b29b8019a956666125c3c637 (patch)
tree984aa0e78dcfbf88e7b843f05c1e09ef686e2f7d
parent6c05fff9fac7dce9adc1757439b568af29d27ac4 (diff)
downloadnavit-54dc6b71661a9368b29b8019a956666125c3c637.tar.gz
Add struct traffic *traffic; lost on trunk merge conflict
-rw-r--r--navit/attr.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/navit/attr.h b/navit/attr.h
index 3d691db43..a9e4d9467 100644
--- a/navit/attr.h
+++ b/navit/attr.h
@@ -204,6 +204,7 @@ struct attr {
struct osd *osd;
struct range range;
struct navit_object *navit_object;
+ struct traffic *traffic;
int *dash;
enum item_type *item_types;
enum attr_type *attr_types;