Ignore:
Timestamp:
May 26, 2009, 3:34:36 PM (15 years ago)
Author:
garnier
Message:

update pas dans CVS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/visualization/OpenGL/src/G4OpenGLXmSliderBar.cc

    r1046 r1049  
    2525//
    2626//
    27 <<<<<<< G4OpenGLXmSliderBar.cc
    2827// $Id: G4OpenGLXmSliderBar.cc,v 1.7 2006/06/29 21:20:00 gunter Exp $
    2928// GEANT4 tag $Name: geant4-09-02-ref-02 $
    30 =======
    31 // $Id: G4OpenGLXmSliderBar.cc,v 1.8 2009/01/19 16:53:42 lgarnier Exp $
    32 // GEANT4 tag $Name:  $
    33 >>>>>>> 1.8
    3429//
    3530//Slider bar class. Inherits from G4OpenGLXmVWidgetComponent
Note: See TracChangeset for help on using the changeset viewer.