Merge branch 'stars' of git://git.hohndel.org/subsurface

* 'stars' of git://git.hohndel.org/subsurface:
  Fix some issues with star rating code
  Add typical 0 to 5 star rating for dives

Still not great editing, but other than that it looks good.

1 files changed, 1 insertions, 0 deletions

diff --git a/dive.c b/dive.c
index 31be3291d..3fa09bd10 100644
--- a/dive.c
+++ b/dive.c
@@ -559,6 +559,7 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
 	MERGE_TXT(res, a, b, notes);
 	MERGE_TXT(res, a, b, buddy);
 	MERGE_TXT(res, a, b, divemaster);
+	MERGE_MAX(res, a, b, rating);
 	MERGE_MAX(res, a, b, number);
 	MERGE_MAX(res, a, b, maxdepth.mm);
 	res->meandepth.mm = 0;