Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3423 in orxonox.OLD for orxonox/trunk/Makefile.in


Ignore:
Timestamp:
Feb 27, 2005, 7:11:19 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged branches/updater back into the trunk
merged with command: svn merge branches/updater trunk -r 3241:HEAD
resolved conflicts in debug.h in favor of the trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/Makefile.in

    r3377 r3423  
    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@
Note: See TracChangeset for help on using the changeset viewer.