I forgot to update my tree before commiting (once again), and got conflicts as punishment

[simgrid.git] / include / msg / msg.h

diff --git a/include/msg/msg.h b/include/msg/msg.h
index 625cc6f..d28939b 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -102,6 +102,7 @@ XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char
                                                             code,
                                                             void *data,
                                                             m_host_t host,
                                                             code,
                                                             void *data,
                                                             m_host_t host,

+                                                            double kill_time,

                                                             int argc,
                                                             char **argv,
                                                             xbt_dict_t
                                                             int argc,
                                                             char **argv,
                                                             xbt_dict_t