Ignore:
Timestamp:
May 18, 2009, 11:48:22 AM (15 years ago)
Author:
garnier
Message:

update

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/visualization/OpenGL/src/G4OpenGLXmViewerMessenger.cc

    r951 r1046  
    2525//
    2626//
     27<<<<<<< G4OpenGLXmViewerMessenger.cc
    2728// $Id: G4OpenGLXmViewerMessenger.cc,v 1.4 2006/06/29 21:20:18 gunter Exp $
    2829// GEANT4 tag $Name: geant4-09-02-ref-02 $
     30=======
     31// $Id: G4OpenGLXmViewerMessenger.cc,v 1.5 2009/01/19 16:53:42 lgarnier Exp $
     32// GEANT4 tag $Name:  $
     33>>>>>>> 1.5
    2934
    3035#ifdef G4VIS_BUILD_OPENGLXM_DRIVER
Note: See TracChangeset for help on using the changeset viewer.