Skip to content

Commit

Permalink
Merge branch 'dev-2.2' of https://github.com/syscoin/syscoin2 into de…
Browse files Browse the repository at this point in the history
…v-2.2
  • Loading branch information
sidhujag committed Nov 23, 2017
2 parents 3224b85 + 309c101 commit 349de28
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion COPYING
@@ -1,6 +1,7 @@
The MIT License (MIT)

Copyright (c) 2009-2016 The Syscoin Core developers
Copyright (c) 2009-2016 The Bitcoin Core developers
Copyright (c) 2014-2017 The Dash Core developers
Copyright (c) 2014-2017 The Syscoin Core developers

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -16,7 +16,7 @@ SYSCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EX

OSX_APP=Syscoin-Qt.app
OSX_DMG=Syscoin-Core.dmg
OSX_BACKGROUND_IMAGE=background.tiff
OSX_BACKGROUND_IMAGE=background.png
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_BASE_LPROJ_DIR=$(top_srcdir)/contrib/macdeploy/Base.lproj/InfoPlist.strings
Expand Down
Binary file modified contrib/macdeploy/background.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 349de28

Please sign in to comment.