Merge branch 'master' of github.com:Storj/farmer-gui

storj-archived · Apr 29, 2016 · ed3b9fd · ed3b9fd
2 parents b84a792 + 85784d7
commit ed3b9fd
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 0 deletions.
diff --git a/resources/icon.png b/resources/icon.png
diff --git a/resources/osx/icon.icns b/resources/osx/icon.icns
diff --git a/resources/osx/iconHighlight.png b/resources/osx/iconHighlight.png
diff --git a/resources/osx/[email protected] b/resources/osx/[email protected]
diff --git a/resources/osx/iconTemplate.png.psd b/resources/osx/iconTemplate.png.psd
diff --git a/resources/osx/[email protected] b/resources/osx/[email protected]
diff --git a/resources/osx/trayHighlight.png b/resources/osx/trayHighlight.png
diff --git a/resources/osx/[email protected] b/resources/osx/[email protected]
diff --git a/resources/osx/trayTemplate.png.psd b/resources/osx/trayTemplate.png.psd
diff --git a/resources/osx/[email protected] b/resources/osx/[email protected]
diff --git a/resources/windows/icon.ico b/resources/windows/icon.ico
diff --git a/resources/windows/setup-icon.ico b/resources/windows/setup-icon.ico
diff --git a/resources/windows/tray.ico b/resources/windows/tray.ico