Commits · 4ca6daf8b658524b2035c3e1865f353eb4e5ecb2 · aflab / astrogeology / ISIS3 · GitLab

Aug 31, 2018
- Merge pull request #418 from SgStapleton/cmakeTests · 4ca6daf8
  Kaitlyn Lee authored Aug 31, 2018
  4ca6daf8
- Merge pull request #419 from AgoinsUSGS/merge_fix · a48af9a9
  Summer Stapleton authored Aug 31, 2018
  a48af9a9
- Fixed bad conflict fix · 451bbbd2
  Adam Goins authored Aug 31, 2018
  
  451bbbd2
- Merge pull request #397 from AgoinsUSGS/dev_merge · 51876792
  Summer Stapleton authored Aug 31, 2018
  51876792
- Changing tolerence in equalizer_app_test_gain Makefile to pass test · a2a8db44
  Summer Stapleton authored Aug 31, 2018
  
  a2a8db44
Aug 30, 2018
- Merge branch 'cmake' of github.com:USGS-Astrogeology/ISIS3 into cmake · 5881b4d5
  Summer Stapleton authored Aug 30, 2018
  
  5881b4d5
- Merge pull request #412 from SgStapleton/squish · bbbc69bb
  Makayla Shepherd authored Aug 30, 2018
  bbbc69bb
Aug 29, 2018
- Updating truthdata for ProgramLauncher to account for OS specific termination codes/errors · 7ff67bd4
  Summer Stapleton authored Aug 29, 2018
  
  7ff67bd4
- Updating Calculator truthdata to account for '-nan' vs 'nan' · e4e7720c
  Summer Stapleton authored Aug 29, 2018
  
  e4e7720c
- Merge branch 'cmake' of github.com:USGS-Astrogeology/ISIS3 into dev_merge · 10c1880c
  Adam Goins authored Aug 29, 2018
  
  10c1880c
- Fixed merge conflicts · 91dc2392
  Adam Goins authored Aug 29, 2018
  
  91dc2392
- Merge pull request #415 from ihumphrey-usgs/cmake · 08b16365
  Summer Stapleton authored Aug 29, 2018
  08b16365
- Merge pull request #416 from kberryUSGS/remove_installer · 28c5a291
  AgoinsUSGS authored Aug 29, 2018
  28c5a291
- Update ISIS3 installation instructions to: remove references to Java-based... · 1b3799b3
  Kristin Berry authored Aug 29, 2018
  1b3799b3
Aug 28, 2018
- re-add gold linker for only linux · 72d0b089
  Ian Humphrey authored Aug 28, 2018
  
  72d0b089
- remove gold ld and phtread, failed on macOS · 2f90412b
  Ian Humphrey authored Aug 28, 2018
  
  2f90412b
- Merge pull request #414 from kberryUSGS/osx_warnings · f97a967d
  ihumphrey authored Aug 28, 2018
  f97a967d
- Merge pull request #406 from kdl222/headers · 03437a84
  AgoinsUSGS authored Aug 28, 2018
  03437a84
- Merge pull request #378 from dcookastro/devRadii · 84c1c25e
  dcookastro authored Aug 28, 2018
  84c1c25e
- Merge branch 'devRadii' of github.com:USGS-Astrogeology/ISIS3 into devRadii · c2028e82
  dcookastrog authored Aug 28, 2018
  
  c2028e82
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into devRadii · 4c809e25
  dcookastrog authored Aug 28, 2018
  
  4c809e25
- Update CMakeLists.txt with explicit pthread for gold loader · 7de0261c
  ihumphrey authored Aug 28, 2018
  
  7de0261c
- Update BulletDskShape.h · 4d6c52b8
  Kristin authored Aug 28, 2018
  
  4d6c52b8
- Update BulletDskShape.cpp · 08a8290a
  Kristin authored Aug 28, 2018
  08a8290a
- Fix typo · 25da015b
  Kristin Berry authored Aug 28, 2018
  
  25da015b
- Update to remove mac build warnings · c8292afc
  Kristin Berry authored Aug 28, 2018
  
  c8292afc
- Add gold linker to speed up linux (ubuntu) builds · 64f76a4d
  Ian Humphrey authored Aug 28, 2018
  
  64f76a4d
Aug 27, 2018
- Merge pull request #413 from jessemapel/m05425 · 63490c5e
  Kristin authored Aug 27, 2018
  63490c5e
- Removing SquishTests category tests · 04217a3e
  Summer Stapleton authored Aug 27, 2018
  
  04217a3e
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into m05425 · 662bf53e
  Jesse Mapel authored Aug 27, 2018
  
  662bf53e
Aug 24, 2018
- Merge pull request #411 from dcookastro/devRadii · dc53a8be
  dcookastro authored Aug 24, 2018
  dc53a8be
- Fixed SurfacePoint change that was missed in fixing conflicts · 5c99c75b
  dcookastrog authored Aug 24, 2018
  
  5c99c75b
- Merge branch 'devRadii' of github.com:dcookastro/ISIS3 into devRadii · aecc2620
  dcookastrog authored Aug 24, 2018
  
  aecc2620
- Merged Astrog:dev into my devRadii clone and fixed conflict in ControlNet.h · f2619986
  dcookastrog authored Aug 24, 2018
  
  f2619986
- Set useQuantizedAabbCompression = false in BulletDskShape to fix segfaults... · 59859f12
  Kristin Berry authored Aug 24, 2018
  59859f12
- Merge pull request #409 from dcookastro/devRadii · 23866ed6
  dcookastro authored Aug 23, 2018
  23866ed6
- Merge branch 'dev' into devRadii · 5e329e25
  dcookastro authored Aug 23, 2018
  
  5e329e25
- Merge branch 'devRadii' into devRadii · 8a2ad6b5
  dcookastro authored Aug 23, 2018
  
  8a2ad6b5
Aug 23, 2018
- Merge pull request #407 from kdl222/macOS · 9da06de1
  Christopher Ryan Combs Jr authored Aug 23, 2018
  9da06de1
Aug 22, 2018
- Changed SurfacePoint member localRadius from a pointer to a Distance · 0a9d19be
  dcookastrog authored Aug 22, 2018
  
  0a9d19be