<HTML><BODY><div id="composeWebView_editable_content" data-mailruapp-compose-id="composeWebView_editable_content" style="text-align: left;">Dirk.<div>If I stash my current changes and get the new master would I pickup Lubomir's changes? <br><br>G. Lerch<br><br><br>Dienstag, 8. September 2015 19:04 +0200 von Lubomir I. Ivanov <neolit123@gmail.com>:<br> <div id="composeWebView_previouse_content" data-mailruapp-compose-id="composeWebView_previouse_content"><blockquote style="border-left: 1px solid #fc2c38; margin: 10px 10px 10px 5px; padding: 0 0 0 10px;"><div class="js-helper js-readmsg-msg">
<style type="text/css"></style>
<div>
<base target="_self" href="https://e-aj.my.com/">
<div id="style_14417318940000003239_BODY">From: "Lubomir I. Ivanov" <<a href="/compose?To=neolit123@gmail.com">neolit123@gmail.com</a>><br>
<br>
Signed-off-by: Lubomir I. Ivanov <<a href="/compose?To=neolit123@gmail.com">neolit123@gmail.com</a>><br>
---<br>
uemis-downloader.c | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/uemis-downloader.c b/uemis-downloader.c<br>
index 0cb0f9f..2fe91e4 100644<br>
--- a/uemis-downloader.c<br>
+++ b/uemis-downloader.c<br>
@@ -135,7 +135,7 @@ static struct dive *uemis_start_dive(uint32_t deviceid)<br>
return dive;<br>
}<br>
<br>
-static struct dive *get_dive_by_uemis_diveid(device_data_t *devdata, u_int32_t object_id)<br>
+static struct dive *get_dive_by_uemis_diveid(device_data_t *devdata, uint32_t object_id)<br>
{<br>
for (int i = 0; i < devdata->download_table->nr; i++) {<br>
if (object_id == devdata->download_table->dives[i]->dc.diveid)<br>
-- <br>
1.7.11.msysgit.0<br>
<br>
_______________________________________________<br>
subsurface mailing list<br>
<a href="/compose?To=subsurface@subsurface%2ddivelog.org">subsurface@subsurface-divelog.org</a><br>
<a href="http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface" target="_blank">http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface</a><br>
</div>
<base target="_self" href="https://e-aj.my.com/">
</div>
</div></blockquote></div></div></div></BODY></HTML>