Merge remote-tracking branch 'upstream/master' into loadout_copy_paste
actually load the strength applied flag on items.
Merge remote-tracking branch 'upstream/master' into loadout_copy_paste
- Fixed bugs with New Battle and mods.
- Fixed memory leak with soldier deaths.
- Minor UI fixes.
Merge pull request #801 from winterheart/icons-in-main-window

Make icon appear in main window.
Fixed cross-platform icon handling, don't wanna mix it up with mod resources.
- Added right-click to view soldier info from Craft Equip.
- Added left-click to view soldier info on Memorial.
- Fixed bravery in New Battle generated soldiers.
fix importing saves from 0.9

rename a variable, grenades will now be unprimed by default instead of all
being primed to go off immediately.
Fix
Fix undefined reference compilation error on Linux and Mac OS X.
According to
http://code.google.com/p/googletest/wiki/FAQ#The_compiler_complains_about_%22undefined_references%22_to
there should be static const member initialization outside of class.
Change file permissions to 644
Merge pull request #803 from winterheart/compilation-fix

Fix undefined reference linker error on Linux and Mac OS X.
- Fixed craft renaming not working.
- Fixed HWPs not reloading when new ammo arrived.
- Added Prev/Next key shortcuts to Basescape soldier info.
- Fixed compiler error.
string change

rename that button to better represent it's meaning

i'd have gone for "TUs remaining" but that'd probably wind up ridiculously long.
Fixes
fix broken strings in battlescape
alter pathfinding spriteset

give an example of subdivision within the ruleset, and hopefully fix the
issue with loading png on a mac by replacing transparent with magenta
apply palette adjustment for OSX to other sprites
I don't even
no more burning air