From 2a803c040703dc3f5b2dba24546e3397d7aba466 Mon Sep 17 00:00:00 2001
From: Marc Maurer <uwog@uwog.net>
Date: Wed, 29 Aug 2007 10:55:00 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/write

Conflicts:

	NEWS
---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 1e9e679..73c49df 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 * Use a journal object picker when inserting images, instead of a normal
   GTK+ Open File dialog
+* Port to new tubes API. (cassidy)
 * Add supported mimetypes for abiword, msword, xhtml, html and rtf
 * Add a format toolbar
 * Implement basic style support
--
cgit v0.9.1