Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/Makefile.in


Ignore:
Timestamp:
Mar 1, 2005, 9:50:30 AM (19 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/Makefile.in

    r3219 r3430  
    8585CPP = @CPP@
    8686CPPFLAGS = @CPPFLAGS@
     87CURL_CFLAGS = @CURL_CFLAGS@
     88CURL_LIBS = @CURL_LIBS@
    8789CXX = @CXX@
    8890CXXDEPMODE = @CXXDEPMODE@
    … …  
    100102EGREP = @EGREP@
    101103EXEEXT = @EXEEXT@
     104GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
     105GTHREAD_LIBS = @GTHREAD_LIBS@
    102106GTK2_CFLAGS = @GTK2_CFLAGS@
    103107GTK2_LIBS = @GTK2_LIBS@
     108HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
     109HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
     110HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
     111HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    104112HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    105113HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    125133SHELL = @SHELL@
    126134STRIP = @STRIP@
     135SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
     136SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
    127137VERSION = @VERSION@
    128138ac_ct_CC = @ac_ct_CC@
Note: See TracChangeset for help on using the changeset viewer.