[longomatch/stop: 3/3] Merge branch 'master' into stop

[Andoni Morales Alastruey <amorales src gnome org>]

commit df241b8650226eedd2e95bca5a8aadff5fc907b7
Merge: 376ba2a... 41adc82...
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Sun Oct 11 17:20:34 2009 +0200

    Merge branch 'master' into stop

 CesarPlayer/CesarPlayer.dll.config.in |    3 +++
 CesarPlayer/Makefile.am               |   12 ++++++++----
 LongoMatch/DB/DataBase.cs             |    3 ++-
 configure.ac                          |    1 +
 4 files changed, 14 insertions(+), 5 deletions(-)
---
diff --cc LongoMatch/DB/DataBase.cs
index 5da1ab0,9bab21a..e600309
--- a/LongoMatch/DB/DataBase.cs
+++ b/LongoMatch/DB/DataBase.cs
@@@ -221,10 -221,9 +221,11 @@@ namespace LongoMatch.D
  			Db4oFactory.Configure().ObjectClass(typeof(TimeNode)).CascadeOnDelete(true);
  			Db4oFactory.Configure().ObjectClass(typeof(Time)).CascadeOnDelete(true);
  			Db4oFactory.Configure().ObjectClass(typeof(Team)).CascadeOnDelete(true);
- 			Db4oFactory.Configure().ObjectClass(typeof(HotKey)).CascadeOnDelete(true);
+ 			Db4oFactory.Configure().ObjectClass(typeof(HotKey)).CascadeOnDelete(true);
+ 			Db4oFactory.Configure().ObjectClass(typeof(Player)).CascadeOnDelete(true);
  			Db4oFactory.Configure().ObjectClass(typeof(TeamTemplate)).CascadeOnDelete(true);
 +			Db4oFactory.Configure().ObjectClass(typeof(Drawing)).CascadeOnDelete(true);
 +			Db4oFactory.Configure().ObjectClass(typeof(DrawingsList)).CascadeOnDelete(true);
  		}
  		
  		private bool Exists(string filename){