Merge branch 'mc' into mc++

[simgrid.git] / examples / java / masterslave / Masterslave.java

diff --git a/examples/java/masterslave/Masterslave.java b/examples/java/masterslave/Masterslave.java
index 8e15954..f5518ab 100644 (file)
--- a/examples/java/masterslave/Masterslave.java
+++ b/examples/java/masterslave/Masterslave.java
@@ -1,9 +1,8 @@
-/*
- * Copyright 2006-2012. The 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.
- */
+/* Copyright (c) 2006-2014. The 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. */
 
 package masterslave;