Merge branch 'master' of github.com:enGits/engrid

# Conflicts:
#	src/libengrid/engrid.qrc

diff --cc src/libengrid/CMakeLists.txt
Simple merge

diff --cc src/libengrid/guimainwindow.ui
index 861c0a0,7c60b5a..e217e49
--- 1/src/libengrid/guimainwindow.ui
--- 2/src/libengrid/guimainwindow.ui
+++ b/src/libengrid/guimainwindow.ui
@@@ -187,9 -186,9 +187,8 @@@
      <addaction name="actionExportAsciiPly"/>
      <addaction name="actionExportBinaryPly"/>
      <addaction name="menuOpenFOAM"/>
 -    <addaction name="actionExportDrNum"/>
      <addaction name="actionExportDolfyn"/>
      <addaction name="actionExportSu2"/>
-     <addaction name="actionExportTau"/>
      <addaction name="actionExportCGNS"/>
      <addaction name="actionExportBlenderFile"/>
     </widget>