From b34bb792049ca6b606cba0ed631d2924ef6e9b72 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Fri, 07 Dec 2007 14:59:08 +0000
Subject:  Release version 78.

---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index be97145..61b1f0f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
+78
+
+<<<<<<< HEAD:NEWS
 77
 
+=======
+* Give to the DS the ownership of the files we hand to it #5235 (tomeu)
+>>>>>>> d347f616e9d1177aae343ac9d0d04df51c2c6078:NEWS
 * Open an uri of type text/uri-list with browse #5080 (erikos)
 * Save view source to SAR/instance #5251 (erikos)
 * Move the profile in SAR/data #5221 (erikos)
--
cgit v0.9.1