Author: ssmiweve
Date: 2008-11-20 13:11:22 +0100 (Thu, 20 Nov 2008)
New Revision: 6963

Modified:
   trunk/
   trunk/pom.xml
Log:
svnmerge.py init http://sesat.no/svn/sesat-kernel/branches/2.18



Property changes on: trunk
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 
/branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 
/branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6713,6715-6927 
/branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 
/branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544
   + /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 
/branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 
/branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6713,6715-6927 
/branches/2.18:1-6960 /branches/2.6:1-3877 /branches/2.7:1-4160 
/branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml       2008-11-20 11:59:20 UTC (rev 6962)
+++ trunk/pom.xml       2008-11-20 12:11:22 UTC (rev 6963)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (2007) Schibsted Søk AS
+<!-- Copyright (2007-2008) Schibsted Søk AS
  *   This file is part of SESAT.
  *
  *   SESAT is free software: you can redistribute it and/or modify

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to