Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4054 in orxonox.OLD for orxonox/trunk/src/subprojects


Ignore:
Timestamp:
May 5, 2005, 1:32:47 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the guiMerge-branche back into the trunk
merged with command:
svn merge -r 4043:HEAD guiMerge/ ../trunk/
no conflicts, only updates and moves :)

Location:
orxonox/trunk/src/subprojects
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/subprojects/Makefile.in

    r3789 r4054  
    117117PACKAGE_VERSION = @PACKAGE_VERSION@
    118118PATH_SEPARATOR = @PATH_SEPARATOR@
     119RANLIB = @RANLIB@
    119120SET_MAKE = @SET_MAKE@
    120121SHELL = @SHELL@
    … …  
    125126ac_ct_CC = @ac_ct_CC@
    126127ac_ct_CXX = @ac_ct_CXX@
     128ac_ct_RANLIB = @ac_ct_RANLIB@
    127129ac_ct_STRIP = @ac_ct_STRIP@
    128130am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/trunk/src/subprojects/testmain/Makefile.in

    r3789 r4054  
    132132PACKAGE_VERSION = @PACKAGE_VERSION@
    133133PATH_SEPARATOR = @PATH_SEPARATOR@
     134RANLIB = @RANLIB@
    134135SET_MAKE = @SET_MAKE@
    135136SHELL = @SHELL@
    … …  
    140141ac_ct_CC = @ac_ct_CC@
    141142ac_ct_CXX = @ac_ct_CXX@
     143ac_ct_RANLIB = @ac_ct_RANLIB@
    142144ac_ct_STRIP = @ac_ct_STRIP@
    143145am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
Note: See TracChangeset for help on using the changeset viewer.