Merge branch 'Brewtarget:develop' into 3.0.X

Brewtarget · Dec 30, 2022 · 38a30cd · 38a30cd
2 parents c0fa683 + b22ad2a
commit 38a30cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,8 @@ build/*
 
 .vagrant
 *.user
+
+# ccls files
+.ccls-cache/
+src/.ccls-cache/
+src/compile_commands.json
diff --git a/brewtarget.qrc b/brewtarget.qrc
@@ -75,6 +75,8 @@
       <file alias="images/smallYeast.svg">images/smallYeast.svg</file>
       <file alias="images/sound.png">images/sound.png</file>
       <file alias="images/testtube.svg">images/testtube.svg</file>
+      <file alias="images/title.svg">images/title.svg</file>
+      <file alias="images/title.png">images/title.png</file>
       <file alias="images/yeastVial.svg">images/yeastVial.svg</file>
       <file alias="schemas/beerxml/v1/BeerXml.xsd">schemas/beerxml/v1/BeerXml.xsd</file>
    </qresource>