Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
devlinx9 committed Oct 30, 2021
2 parents 3ec74f6 + e19fdf2 commit 207e87a
Show file tree
Hide file tree
Showing 23 changed files with 3 additions and 681 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ target/*
/target/
.classpath
.project
.settings/
.settings/
flatpak/flatpak-commands.txt
muon-app/target/*
muon-jediterm/target/*
Expand All @@ -16,3 +16,4 @@ muon-jediterm/target/*
muon-app/target/maven-archiver/pom.properties
muon-jediterm/target/*
muon-jediterm\target\*
/muon-app/target/
1 change: 1 addition & 0 deletions muon-app/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
target/
target/*
/target/
Binary file removed muon-app/target/classes/fonts/DejaVuSans.ttf
Binary file not shown.
Binary file removed muon-app/target/classes/fonts/Helvetica.ttf
Binary file not shown.
Binary file removed muon-app/target/classes/fonts/Verdana.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed muon-app/target/classes/muon.png
Binary file not shown.
73 changes: 0 additions & 73 deletions muon-app/target/classes/scripts/linux-sysinfo.sh

This file was deleted.

9 changes: 0 additions & 9 deletions muon-app/target/classes/scripts/ps.sh

This file was deleted.

121 changes: 0 additions & 121 deletions muon-app/target/classes/scripts/search.sh

This file was deleted.

5 changes: 0 additions & 5 deletions muon-app/target/maven-archiver/pom.properties

This file was deleted.

Loading

0 comments on commit 207e87a

Please sign in to comment.