Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/Makefile.in


Ignore:
Timestamp:
May 18, 2005, 11:27:40 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/movie_player/Makefile.in

    r3789 r4217  
    105105EXEEXT = @EXEEXT@
    106106GPROF = @GPROF@
    107 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    108 GTHREAD_LIBS = @GTHREAD_LIBS@
    109107GTK2_CFLAGS = @GTK2_CFLAGS@
    110108GTK2_LIBS = @GTK2_LIBS@
    111109HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    112110HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    113 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    114 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    115111HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    116112HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
     
    133129PACKAGE_VERSION = @PACKAGE_VERSION@
    134130PATH_SEPARATOR = @PATH_SEPARATOR@
     131PKG_CONFIG = @PKG_CONFIG@
     132RANLIB = @RANLIB@
    135133SET_MAKE = @SET_MAKE@
    136134SHELL = @SHELL@
     
    141139ac_ct_CC = @ac_ct_CC@
    142140ac_ct_CXX = @ac_ct_CXX@
     141ac_ct_RANLIB = @ac_ct_RANLIB@
    143142ac_ct_STRIP = @ac_ct_STRIP@
    144143am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Note: See TracChangeset for help on using the changeset viewer.