Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Mon, 08 Oct 2007 14:14:24 +0100
changeset 1699 fe78de8fa6df
parent 1698 3e1b36118659 (current diff)
parent 1696 0de65f4c8c43 (diff)
child 1700 2f03a3b8a225
merge
--- a/src/simulator/event-id.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/event-id.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/event-id.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/event-id.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/event-impl.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/event-impl.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/event-impl.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/event-impl.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005,2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/high-precision-128.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/high-precision-128.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/high-precision-128.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/high-precision-128.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/high-precision-double.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/high-precision-double.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/high-precision-double.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/high-precision-double.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/high-precision.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/high-precision.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/high-precision.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/high-precision.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/nstime.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/nstime.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005,2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler-factory.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler-factory.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler-factory.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler-factory.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler-heap.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler-heap.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -2,7 +2,6 @@
 /*
  * Copyright (c) 2006 INRIA
  * Copyright (c) 2005 Mathieu Lacage
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -20,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  *
  * This code started as a c++ translation of a java-based code written in 2005
- * to implement a heap sort. Which explains the Copyright Mathieu Lacage at the
+ * to implement a heap sort. Which explains the "Copyright Mathieu Lacage" at the
  * top of this file.
  *
  * What is smart about this code ?
--- a/src/simulator/scheduler-heap.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler-heap.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler-list.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler-list.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler-list.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler-list.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler-map.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler-map.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler-map.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler-map.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/scheduler.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/scheduler.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/simulation-singleton.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/simulation-singleton.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2007 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/simulator.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/simulator.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005,2006 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/simulator.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/simulator.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2005 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/time-default-value.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/time-default-value.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2007 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/time-default-value.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/time-default-value.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,7 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
  * Copyright (c) 2007 INRIA
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/time.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/time.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -2,7 +2,6 @@
 /*
  * Copyright (c) 2005,2006 INRIA
  * Copyright (c) 2007 Emmanuelle Laprise
- * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
--- a/src/simulator/timer.cc	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/timer.cc	Mon Oct 08 14:14:24 2007 +0100
@@ -1,3 +1,22 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2005,2007 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
 #include "timer.h"
 #include "simulator.h"
 #include "simulation-singleton.h"
--- a/src/simulator/timer.h	Mon Oct 08 14:13:58 2007 +0100
+++ b/src/simulator/timer.h	Mon Oct 08 14:14:24 2007 +0100
@@ -1,3 +1,22 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2005,2007 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
 #ifndef TIMER_H
 #define TIMER_H
ns-3.24