Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/config.h.in


Ignore:
Timestamp:
May 9, 2005, 11:29:19 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:
orxonox/branches/heightMap
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/heightMap

    • Property svn:externals

      •  

        old new  
        1 data http://svn.orxonox.ethz.ch/data
         1

  • orxonox/branches/heightMap/config.h.in

    r3863 r4122  
    1818/* Define to 1 if you have the <GL/gl.h> header file. */
    1919#undef HAVE_GL_GL_H
    20 
    21 /* if we have gThread */
    22 #undef HAVE_GTHREAD
    2320
    2421/* if we have GTK2 */
    … …  
    4340/* Define to 1 if you have the <OpenGL/gl.h> header file. */
    4441#undef HAVE_OPENGL_GL_H
    45 
    46 /* Define to 1 if you have the <pthread.h> header file. */
    47 #undef HAVE_PTHREAD_H
    4842
    4943/* Define to 1 if you have the <SDL.h> header file. */
Note: See TracChangeset for help on using the changeset viewer.