Commit c4a29126 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Merge remote-tracking branch 'upstream/dev' into dev

parents a27e9b2e 688b62ef

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ object_script.*.Debug 
*_plugin_import.cpp

*.moc

ui_*.h

*.html



# ignore all files created by squish coco

*csmes

isis/src/base/objs/PvlTranslationTable/PvlTranslationTable.cpp

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ namespace Isis { 
      const PvlKeyword &key = *it;

      // compare the value from the input file to the second value of each Translation in the trans file.

      // ignore cases for input values  

      if((QString) key[1] == tmpFValue) {

      if(QString::compare((QString) key[1], tmpFValue, Qt::CaseInsensitive) == 0) {

        return key[0];

      }

      else if((QString) key[1] == "*") {