Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / include / gras / timer.h

diff --git a/include/gras/timer.h b/include/gras/timer.h
index bb266bd..40c3062 100644 (file)
--- a/include/gras/timer.h
+++ b/include/gras/timer.h
@@ -28,7 +28,7 @@ SG_BEGIN_DECL()
  *  and such within a specific process.
  *
  *  Timers are served by the gras_handle() function: if there is an elapsed 
- *  timer, the associated code gets executed before any incomming connexion 
+ *  timer, the associated code gets executed before any incoming connexion 
  *  are checked. 
  *
  *  The section \ref GRAS_ex_timer constitutes a perfect example of these features.
@@ -51,4 +51,4 @@ XBT_PUBLIC(void) gras_timer_cancel_all(void);
 /** @} */
 
 SG_END_DECL()
-#endif /* GRAS_TIMER_H */
+#endif                          /* GRAS_TIMER_H */