Dirk. If I stash my current changes and get the new master would I pickup Lubomir's changes?
G. Lerch Dienstag, 8. September 2015 19:04 +0200 von Lubomir I. Ivanov <[email protected]>: >From: "Lubomir I. Ivanov" < [email protected] > > >Signed-off-by: Lubomir I. Ivanov < [email protected] > >--- > uemis-downloader.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/uemis-downloader.c b/uemis-downloader.c >index 0cb0f9f..2fe91e4 100644 >--- a/uemis-downloader.c >+++ b/uemis-downloader.c >@@ -135,7 +135,7 @@ static struct dive *uemis_start_dive(uint32_t deviceid) > return dive; > } > >-static struct dive *get_dive_by_uemis_diveid(device_data_t *devdata, >u_int32_t object_id) >+static struct dive *get_dive_by_uemis_diveid(device_data_t *devdata, uint32_t >object_id) > { > for (int i = 0; i < devdata->download_table->nr; i++) { > if (object_id == devdata->download_table->dives[i]->dc.diveid) >-- >1.7.11.msysgit.0 > >_______________________________________________ >subsurface mailing list >[email protected] >http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
_______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
