model-checker : merge conflict resolved

[simgrid.git] / src / mc / mc_state.c

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index 6c3b927..858cc93 100644 (file)
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -1,4 +1,7 @@
+/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved.            */
 
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "../simix/smx_private.h"
 #include "xbt/fifo.h"