[colossus/f13/master: 10/10] Merge branch 'master' into f13

[Bruno Wolff III]

commit 0ca80cf7536a916774050032c0f0540b9493698c
Merge: 2f2a6a6 78a87ad
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Mar 20 11:58:01 2011 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	colossus.spec
    	sources

 .gitignore    |    6 ++++-
 colossus.spec |   68 ++++++++++++++++++++++++++++++--------------------------
 sources       |    2 +-
 3 files changed, 42 insertions(+), 34 deletions(-)
---
diff --cc .gitignore
index b8109d4,79d631c..647b750
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,5 +1,5 @@@
--colossus--20100405-4798.tar.gz
++/colossus--20100405-4798.tar.gz
+ /colossus--20100805-4905.tar.gz
+ /colossus--20110116-4969.tar.gz
+ /colossus--20110215-4995.tar.gz
+ /colossus--20110304-5003.tar.gz
diff --cc colossus.spec
index b8f0cd2,e5cbbda..6066ad9
--- a/colossus.spec
+++ b/colossus.spec
@@@ -179,13 -152,38 +152,44 @@@ touch --no-create %{_datadir}/pixmaps |
  %{_javadocdir}/%{name}
  
  %changelog
+ * Sat Mar 05 2011 Bruno Wolff III <bruno at wolff.to> - 0.12.1-1
+ - Upstream 0.12.1 release with a few minor bug fixes.
+ - Release notes at http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+ 
+ * Mon Feb 15 2011 Bruno Wolff III <bruno at wolff.to> - 0.12.0-1
+ - Some minor changes to the dino varient
+ - Some fixes for playing via the server
+ - Release notes at http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+ 
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.0-0.2.beta1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ 
+ * Sun Jan 16 2011 Bruno Wolff III <bruno at wolff.to> - 0.12.0-0.1.beta1
+ - Rebase to 0.12.0-beta1
+ - New DinoTitan varient
+ - http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+ - Drop gcj building as that is discouraged these days.
+ 
+ * Sat Aug 21 2010 Bruno Wolff III <bruno at wolff.to> - 0.11.0-1
+ - Rebase to 0.11.0
+ - Play colored angels and captured legion markers
+ - Reminders for splitting, moving and recruiting available
+ - http://colossus.sourceforge.net/docs/RecentChangesDetails.html
+ 
+ * Tue Apr 06 2010 Bruno Wolff III <bruno at wolff.to> - 0.10.3-1
+ - Rebase to 0.10.3
+ - UI improvements to prevent accidentally conceding
+ - Various fixes for playing using the central server
+ - http://colossus.sourceforge.net/docs/RecentChangesDetails.html
  
 +* Tue Apr 06 2010 Bruno Wolff III <bruno at wolff.to> - 0.10.3-1
 +- Rebase to 0.10.3
 +- UI improvements to prevent accidentally conceding
 +- Various fixes for playing using the central server
 +- http://colossus.sourceforge.net/docs/RecentChangesDetails.html
 +
  * Sat Feb 06 2010 Bruno Wolff III <bruno at wolff.to> - 0.10.2-1
  - Rebase to 0.10.2
  - Some useability changes