Resoloved CVS conflict.

8f8045fd · lw · bab7e140 · 8f8045fd
Commit 8f8045fd authored May 26, 2006 by lw
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

wb/lib/wb/src/wb_vrep.h wb/lib/wb/src/wb_vrep.h +9 -7

No files found.
--- a/wb/lib/wb/src/wb_vrep.h
+++ b/wb/lib/wb/src/wb_vrep.h
 /* 
- * Proview   $Id: wb_vrep.h,v 1.25 2006-05-11 07:12:19 claes Exp $
+ * Proview   $Id: wb_vrep.h,v 1.26 2006-05-26 06:59:01 lw Exp $
 * Copyright (C) 2005 SSAB Oxelsund AB.
 *
 * This program is free software; you can redistribute it and/or 
@@ -134,6 +134,8 @@ public:

  virtual wb_orep *next(pwr_tStatus *sts, const wb_orep *o) = 0;

+  //virtual wb_orep *nextClass(pwr_tStatus *sts, const wb_orep *o) = 0;
+
  virtual wb_orep *previous(pwr_tStatus *sts, const wb_orep *o) = 0;

  virtual wb_srep *newSession() = 0;