[nip2/f14: 5/5] Merge branch 'master' into f14

[Adam Goode]

commit f15ef1c482c5abdd17e0b2314a8a945ecb320ff1
Merge: 003fd0c f494126
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Aug 12 14:39:27 2011 -0400

    Merge branch 'master' into f14
    
    Conflicts:
    	nip2.spec

 .gitignore |    3 +--
 nip2.spec  |   28 ++++++++++++++++++++--------
 sources    |    2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)
---
diff --cc nip2.spec
index 587fa5d,d52468b..ac4c34d
--- a/nip2.spec
+++ b/nip2.spec
@@@ -109,11 -113,19 +113,19 @@@ update-mime-database %{_datadir}/mime &
  
  
  %changelog
+ * Fri Aug 12 2011 Adam Goode <adam at spicenitz.org> - 7.24.2-1
+ - New upstream release
+     + Workspace as Graph mode
+     + Better nibs in paintbox
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.22.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
 -* Wed Sep 29 2010 jkeating - 7.22.2-3
 +* Tue Oct 05 2010 jkeating - 7.22.2-1.2
  - Rebuilt for gcc bug 634757
  
 -* Mon Sep 20 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 7.22.2-2
 -- rebuild for new ImageMagick
 +* Fri Sep 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 7.22.2-1.1
 +- rebuild (ImageMagick)
  
  * Fri Aug  6 2010 Adam Goode <adam at spicenitz.org> - 7.22.2-1
  - New upstream release