Commit 3dca4106 authored by Kaitlyn Lee's avatar Kaitlyn Lee
Browse files

Merge branch 'release' of github.com:kdl222/ISIS3 into release

parents 9bd72284 7b66358a

isis/src/base/apps/trackextract/trackextract.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
    </change>

    <change name="Kaitlyn Lee" date="2018-10-16">

      Removed FLOAT_MAX because it was not being used in the code and was causing build warnings 

      on MacOS 10.13.

      on MacOS 10.13. References #5520.

    </change>

  </history>

isis/src/base/objs/CSVReader/CSVReader.h

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ namespace Isis { 
   *                           QString/StringTools merge

   *   @history 2008-06-18 Christopher Austin - Fixed documentation

   *   @history 2017-09-22 Cole Neubauer - Fixed documentation. References #4807

   *   @history 2018-10-18 Kaitlyn Lee - Added "[]" around exception messages. References #5520.

   *   @history 2018-10-18 Kaitlyn Lee - Added "[]" around file names in exception 

   *                           messages. References #5520.



   */

  template <typename TokenStore = QString>