empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
empserver/include
History
Markus Armbruster d8bef8e806 Merge branch 'pathfind' into pathfind-test 
Conflicts:
	src/lib/as/as_cache.c
	src/lib/as/as_stats.c
	src/lib/common/path.c

Modified:
	modified:   include/path.h
	modified:   include/prototypes.h
	modified:   src/lib/update/finish.c
2011-04-12 22:17:21 +02:00
..
budg.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
com.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
combat.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
commands.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
commodity.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
damage.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
distribute.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
econfig-spec.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
empio.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
empobj.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
empthread.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
file.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
game.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
ioqueue.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
item.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
journal.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
land.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
loan.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
lost.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
lwp.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
map.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
match.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
misc.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
mission.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
nat.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
news.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
nsc.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
nuke.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
optlist.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
path.h Merge branch 'pathfind' into pathfind-test 2011-04-12 22:17:21 +02:00
plague.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
plane.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
player.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
power.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
product.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
proto.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
prototypes.h Use the new path finder for sea & air, drop bestownedpath() 2011-04-12 21:51:31 +02:00
queue.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
retreat.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
sect.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
server.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
service.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
ship.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
tel.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
trade.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
treaty.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
types.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
unit.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
update.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
version.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
xdump.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00
xy.h License upgrade to GPL version 3 or later 2011-04-12 21:20:58 +02:00