[tigervnc/f22: 2/2] Merge branch 'f21' into f22

[Tim Waugh]

commit 1b3794d810af2b684c0c5250ab20bd1f55a72336
Merge: ecb7661 c6d7681
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Mar 2 12:16:22 2015 +0000

    Merge branch 'f21' into f22

 .gitignore    | 1 +
 sources       | 2 +-
 tigervnc.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc tigervnc.spec
index 077fa57,ef592c3..e83c055
--- a/tigervnc.spec
+++ b/tigervnc.spec
@@@ -352,16 -345,13 +352,19 @@@ f
  %{_datadir}/icons/hicolor/*/apps/*
  
  %changelog
+ * Mon Mar  2 2015 Tim Waugh <twaugh at redhat.com> - 1.4.3-1
+ - 1.4.3.
+ 
 -* Tue Feb 24 2015 Tim Waugh <twaugh at redhat.com> - 1.4.2-2
 +* Tue Feb 24 2015 Tim Waugh <twaugh at redhat.com> - 1.4.2-3
 +- Use calloc instead of xmalloc.
  - Removed unnecessary configure flags.
  
 +* Wed Feb 18 2015 Rex Dieter <rdieter at fedoraproject.org> 1.4.2-2
 +- rebuild (fltk)
 +
  * Fri Feb 13 2015 Tim Waugh <twaugh at redhat.com> - 1.4.2-1
 +- Rebased xserver116.patch against xorg-x11-server-1.17.1.
 +- Allow build against xorg-x11-server-1.17.
  - 1.4.2.
  
  * Tue Sep  9 2014 Tim Waugh <twaugh at redhat.com> - 1.3.1-11