Jens Ayton 5ad46ca935 Merge remote branch 'origin/maintenance/1.77'
52b6c2b Updated terrastorage network name to terrastorage.dyndns.info
9c35146 [Mac] Remove display.fullScreen.temp logging
58175cc Exclude windows build products (closes #53)
4db315d Update changelog
7138dcf Update .gitignore file
1ff3616 Fix shipEnergyBecameFull event to fire at times other than launching
1ea1cc1 Merge branch 'svn-integration' into maintenance/1.77
a7c0305 Reverted the oops of the previous commit and applied correct fix to sub...
8a73443 Re-applied rotation to subentities, which was taken away on r5639, Not...
98ef76b Fix regression in rotational_velocity key for subentities
8b339d4 Display correct pause key in paused message. (issue #41)
659b572 Expose keyconfig.plist contents to script in oolite.gameSettings.keyConfig
055c480 Fix scanner display bug introduced in 50895952

Conflicts:
	src/Core/Entities/PlayerEntity.m
2013-09-10 09:29:30 +02:00
..
2013-05-11 21:32:45 +02:00
2013-05-13 22:14:03 +02:00
2013-05-11 21:32:45 +02:00