Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 13, 2005, 11:16:33 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged the Trunk into the physics Branche again:
merged with command:
svn merge ../trunk physics -r 3953:HEAD
no important conflicts

Location:
orxonox/branches/physics
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics

    • Property svn:externals

      •  

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

  • orxonox/branches/physics/src/subprojects/testmain/Makefile.in

    r3789 r4178  
    104104EXEEXT = @EXEEXT@
    105105GPROF = @GPROF@
    106 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    107 GTHREAD_LIBS = @GTHREAD_LIBS@
    108106GTK2_CFLAGS = @GTK2_CFLAGS@
    109107GTK2_LIBS = @GTK2_LIBS@
    110108HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    111109HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    112 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    113 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    114110HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    115111HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    132128PACKAGE_VERSION = @PACKAGE_VERSION@
    133129PATH_SEPARATOR = @PATH_SEPARATOR@
     130PKG_CONFIG = @PKG_CONFIG@
     131RANLIB = @RANLIB@
    134132SET_MAKE = @SET_MAKE@
    135133SHELL = @SHELL@
    … …  
    140138ac_ct_CC = @ac_ct_CC@
    141139ac_ct_CXX = @ac_ct_CXX@
     140ac_ct_RANLIB = @ac_ct_RANLIB@
    142141ac_ct_STRIP = @ac_ct_STRIP@
    143142am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Note: See TracChangeset for help on using the changeset viewer.