You can clone with
Resolved conflicts from merge from master
Bumped version number by one for new test package
Revert "Bumped version number by one for new test package"
This reverts commit 6624bdd.
Merge remote-tracking branch 'origin/master'
Replace get_free_memory on windows by using ctypes. Problem with Pope…
…n on GUI, and too complicated to put psutil in third_party.
Added exception handler for memory size checks that return None for c…
Also added note about adding more ram to computer
Fixed test for check memory usage
Merge branch 'free_memory' of github.com:AIFDR/inasafe into free_memory
Nicer error messaging for memory usage requirements
Merge remote-tracking branch 'origin/free_memory' into free_memory
convert to int get_free_memory_win
Work out simple metric for if there is possibly not enough ram for th…
…e analysis (based on 10%)
Merge branch 'master' into free_memory
Revert translations to master
Merge master to minimum_needs branch
Further implementation for reporting possibly memory usage issues pro…
Removed mask array to see if it saves memory
Calculate free memory on osx too.
replace os.name with sys.platform
Resolved merge conflicts
get_free_memory for windows
better handling for #477
Merge branch 'master' of github.com:AIFDR/inasafe
Fix for failing test for #372
IDE update - more config options for OSX
Added unit test for #372