Commits · 91dc23922a1086e7cbe4a208bf3ad2bc1bf8fd59 · aflab / astrogeology / ISIS3 · GitLab

Aug 29, 2018
- Fixed merge conflicts · 91dc2392
  Adam Goins authored Aug 29, 2018
  
  91dc2392
Aug 28, 2018
- 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
Aug 27, 2018
- Merge pull request #413 from jessemapel/m05425 · 63490c5e
  Kristin authored Aug 27, 2018
  63490c5e
- 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
- 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 22, 2018
- Changed SurfacePoint member localRadius from a pointer to a Distance · 0a9d19be
  dcookastrog authored Aug 22, 2018
  
  0a9d19be
Aug 21, 2018
- Merge pull request #404 from kdl222/dev · 5d3ac014
  Summer Stapleton authored Aug 21, 2018
  5d3ac014
- Updated the cube tolerances. · 43d0daed
  Kaitlyn Lee authored Aug 21, 2018
  
  43d0daed
Aug 17, 2018
- Fixed typo · 76c15ba1
  Adam Goins authored Aug 17, 2018
  
  76c15ba1
Aug 16, 2018
- More cleanup in SurfacePoint · ecd62ffd
  dcookastrog authored Aug 15, 2018
  
  ecd62ffd
Aug 14, 2018
- Merge pull request #400 from twilson271828/dev · 4962430d
  Summer Stapleton authored Aug 14, 2018
  4962430d
- Fixed three more files with messed up doxygen tags. These have been causing... · fe97cb6d
  Tyler Wilson authored Aug 14, 2018
  fe97cb6d
Aug 13, 2018
- Merge pull request #396 from TracieSucharski/dev · 4c3b7b70
  kledmundson authored Aug 13, 2018
  4c3b7b70
- Merge branch 'dev' of github.com:TracieSucharski/ISIS3 into dev · 67b5958e
  Tracie Sucharski authored Aug 13, 2018
  
  67b5958e
- Removed unused slot and added more information to the history entry. References #5296. · 90e12297
  Tracie Sucharski authored Aug 13, 2018
  
  90e12297
- Merge branch 'dev' of github.com:AgoinsUSGS/ISIS3 into dev_merge · 61af7feb
  Adam Goins authored Aug 13, 2018
  
  61af7feb
Aug 11, 2018
- Took care of memory problems in SurfacePoint and improved documentation (#386) · 71c63ba2
  dcookastro authored Aug 10, 2018
  
  71c63ba2
Aug 10, 2018
- Update AbstractProjectItemView.cpp · e424124a
  kledmundson authored Aug 10, 2018
  
  e424124a
- Update AbstractProjectItemView.cpp · dc8ef6b0
  kledmundson authored Aug 10, 2018
  
  dc8ef6b0
- Fixed the model/view in ipce so that footprints will load quicker. Fixes #5296. · 0884fdd4
  Tracie Sucharski authored Aug 10, 2018
  
  0884fdd4
- Merge pull request #369 from twilson271828/dev · 2d76b7da
  ihumphrey authored Aug 10, 2018
  2d76b7da
Aug 08, 2018
- Merge pull request #392 from USGS-Astrogeology/ipce · c13ad95c
  kledmundson authored Aug 08, 2018
  c13ad95c
- Update Camera.h · 8999d63e
  kledmundson authored Aug 08, 2018
  
  8999d63e
- Merge pull request #395 from TracieSucharski/ipce · e978ab00
  kledmundson authored Aug 08, 2018
  e978ab00
- Update Directory.h · 645db323
  kledmundson authored Aug 08, 2018
  
  645db323
- Remove the autosave of the active control which was done as a temporary fix... · d7b1b4b1
  Tracie Sucharski authored Aug 08, 2018
  d7b1b4b1
- Updated Bulletshaemodel truth data · 4fc7228a
  Adam Goins authored Aug 07, 2018
  
  4fc7228a
- Restored debug statement-less file · 80be653c
  Adam Goins authored Aug 07, 2018
  
  80be653c
- Merge branch 'cmake' of github.com:USGS-Astrogeology/ISIS3 into cmake · 5a91d43f
  Adam Goins authored Aug 07, 2018
  
  5a91d43f
- Removed debug statements · e6648855
  Adam Goins authored Aug 07, 2018
  
  e6648855
- Fixed BulletShapeModel failing unit test for cmake. · aa826e8f
  Adam Goins authored Aug 07, 2018
  
  aa826e8f
- Merge pull request #383 from AgoinsUSGS/build_warnings · 499eb649
  Summer Stapleton authored Aug 07, 2018
  499eb649