Bump to v1.4.11-1

3 files changed, 35 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2eb12a8d4b4c..0c878a6858ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitahead
 	pkgdesc = THE MOST POWERFUL GIT GUI
-	pkgver = 1.4.9
+	pkgver = 1.4.11
 	pkgrel = 1
 	url = http://gitahead.scitools.com/
 	arch = x86_64
@@ -8,12 +8,12 @@ pkgbase = gitahead
 	depends = qt5-base
 	provides = gitahead
 	conflicts = gitahead
-	source = gitahead-1.4.9.bin::https://gitahead.com/downloads/v1.4.9/GitAhead-1.4.9.sh
+	source = gitahead-1.4.11.bin::https://gitahead.com/downloads/v1.4.11/GitAhead-1.4.11.sh
 	source = gitahead-license
 	source = gitahead.desktop
 	source = gitahead.png
 	source = gitahead.sh
-	sha256sums = 13ff4f7c7b5b02f37a563eaac0d65ffc1b22ae64051c47c0b5fb019220a19537
+	sha256sums = 5785df7fb89423532825eed002da9893204b2ae757c597a45857cf0d05a8787f
 	sha256sums = d71bfb48c954d213986816fc29478c7f80c8bd2dd10d2889bf51897d649eedd6
 	sha256sums = 6070ebf6752f55f8b7d8a79107ce491c3acf04310eeb9a8242b83cfb4df055f2
 	sha256sums = 66cb53fc57eb2ce2e6cd02ff392476fdfb91b723b76ef5da1856e9b5dc1b5c75
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d1f82d65622..3488c75f3795 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,33 @@
+# [v1.4.11 - 2017-11-21](https://gitahead.com/cgi-bin/update.py?platform=linux&version=1.4.10)
+
+## Added
+
+- Added buttons to conflict hunks to choose 'ours' or 'theirs' changes.
+- Disallow staging conflicted files that still contain conflict markers.
+- Log all merge abort actions.
+- Added log text to explain conflict resolution process.
+
+## Fixed
+
+- Fixed failure to show stashes or possible crash in some cases.
+- Fixed regression in updating commit list reference badges when references are added and deleted.
+
+# [v1.4.10 - 2017-11-10](https://gitahead.com/cgi-bin/update.py?platform=linux&version=1.4.9)
+
+## Added
+
+- Changed background color of conflict badges.
+- Added status text to indicate the number of unresolved conflicts.
+- Added conflict hunk background colors on ours and theirs lines.
+
+## Fixed
+
+- Fixed issue with spaces in .gitignore files.
+- Fixed a small memory leak.
+- Fixed conflict hunk check state.
+- Fixed conflict hunk line number issue.
+- (Mac) Fixed issue that prevented the disk image from mounting on systems older than macOS 10.12.
+
 # [v1.4.9 - 2017-11-06](https://gitahead.com/cgi-bin/update.py?platform=linux&version=1.4.8)
 
 ## Added
diff --git a/PKGBUILD b/PKGBUILD
index 387a6b8026bf..9d8a61ff71b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=('gitahead')
 pkgrel=1
-pkgver=1.4.9
+pkgver=1.4.11
 pkgdesc='THE MOST POWERFUL GIT GUI'
 url='http://gitahead.scitools.com/'
 provides=('gitahead')
@@ -17,7 +17,7 @@ source=(
   "gitahead.png"
   "gitahead.sh"
 )
-sha256sums=('13ff4f7c7b5b02f37a563eaac0d65ffc1b22ae64051c47c0b5fb019220a19537'
+sha256sums=('5785df7fb89423532825eed002da9893204b2ae757c597a45857cf0d05a8787f'
             'd71bfb48c954d213986816fc29478c7f80c8bd2dd10d2889bf51897d649eedd6'
             '6070ebf6752f55f8b7d8a79107ce491c3acf04310eeb9a8242b83cfb4df055f2'
             '66cb53fc57eb2ce2e6cd02ff392476fdfb91b723b76ef5da1856e9b5dc1b5c75'