Merge remote-tracking branch 'origin/master'

# Conflicts: # pom.xml
Valkryst · Feb 13, 2018 · a58508c · a58508c
2 parents d29d3d0 + 323b439
commit a58508c
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,3 @@
-#### License: 
-
-Use this code however you wish. Modifications and improvements are welcome.
-
-Please refer to the LICENSE file for additional information.
-
----
-
-### Introduction:
 
 Schillsaver is a program that encodes files from their native formats into a video
 of black and white blocks, which represent the bits of the source file.

diff --git a/res/icons/Attributions.md b/res/icons/Attributions.md
@@ -12,4 +12,7 @@ Icons made by [Hadrien](https://www.flaticon.com/authors/hadrien) from www.flati
 
 Icons edited by Valkryst using Sarafraz Shoukat's work:
 
+* Delete.png
+* Edit.png
+* New.png
 * Process.png
diff --git a/res/icons/Delete.png b/res/icons/Delete.png
diff --git a/res/icons/Edit.png b/res/icons/Edit.png
diff --git a/res/icons/New.png b/res/icons/New.png
diff --git a/res/icons/Process.png b/res/icons/Process.png