Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5750 in orxonox.OLD for trunk/missing


Ignore:
Timestamp:
Nov 24, 2005, 12:13:22 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/missing

    r5479 r5750  
    22# Common stub for a few missing GNU programs while installing.
    33
    4 scriptversion=2005-06-08.21
     4scriptversion=2005-02-08.22
    55
    66# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
     
    2020# You should have received a copy of the GNU General Public License
    2121# along with this program; if not, write to the Free Software
    22 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    23 # 02110-1301, USA.
     22# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
     23# 02111-1307, USA.
    2424
    2525# As a special exception to the GNU General Public License, if you
     
    298298      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    299299    fi
    300     # If the file does not exist, the user really needs makeinfo;
    301     # let's fail without touching anything.
    302     test -f $file || exit 1
    303300    touch $file
    304301    ;;
Note: See TracChangeset for help on using the changeset viewer.