Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/console


Ignore:
Timestamp:
Mar 1, 2005, 9:50:30 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:
orxonox/branches/trackManager
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/trackManager

    • Property svn:externals set to

  • orxonox/branches/trackManager/src/console/Makefile.in

    r3219 r3430  
    8787CPP = @CPP@
    8888CPPFLAGS = @CPPFLAGS@
     89CURL_CFLAGS = @CURL_CFLAGS@
     90CURL_LIBS = @CURL_LIBS@
    8991CXX = @CXX@
    9092CXXDEPMODE = @CXXDEPMODE@
    … …  
    102104EGREP = @EGREP@
    103105EXEEXT = @EXEEXT@
     106GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
     107GTHREAD_LIBS = @GTHREAD_LIBS@
    104108GTK2_CFLAGS = @GTK2_CFLAGS@
    105109GTK2_LIBS = @GTK2_LIBS@
     110HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
     111HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
     112HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
     113HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    106114HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    107115HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    128136SHELL = @SHELL@
    129137STRIP = @STRIP@
     138SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     139SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    130140VERSION = @VERSION@
    131141ac_ct_CC = @ac_ct_CC@
Note: See TracChangeset for help on using the changeset viewer.