resolve other merge conflicht too ...

Update to release 1.4. (specfile too ...)
Conflicts: amtterm.spec
2015-10-29 11:27:08 +01:00 · 2015-10-29 11:21:44 +01:00 · 2015-10-29 11:20:53 +01:00
3 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 amtterm-1.2.tar.gz
 /amtterm-1.3.tar.gz
+/amtterm-1.4.tar.gz
--- a/amtterm.spec
+++ b/amtterm.spec
@ -1,7 +1,7 @@
 Name:         amtterm
 License:      GPLv2+
-Version:      1.3
-Release:      9%{?dist}
+Version:      1.4
+Release:      1%{?dist}
 Summary:      Serial-over-lan (sol) client for Intel AMT
 Group:        Applications/Internet
 URL:          http://www.kraxel.org/blog/linux/amtterm/
@ -39,6 +39,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ \
 %{_datadir}/applications/gamt.desktop

 %changelog
+* Thu Oct 29 2015 Gerd Hoffmann <kraxel@redhat.com> - 1.4-1
+- Update to release 1.4.
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-a2385b2305680ae06687867527924ff5  amtterm-1.3.tar.gz
+b4ad2827c7dddd204b008d08763697ec  amtterm-1.4.tar.gz
Author	SHA1	Message	Date
Gerd Hoffmann	36575a0e08	resolve other merge conflicht too ...	2015-10-29 11:27:08 +01:00
Gerd Hoffmann	f9cff2c1b4	Update to release 1.4. (specfile too ...) Conflicts: amtterm.spec	2015-10-29 11:21:44 +01:00
Gerd Hoffmann	df3115c566	Update to release 1.4.	2015-10-29 11:20:53 +01:00