Rev 203: merge trunk @ 204... in file:///v/home/vila/src/plugins/gtk/

[Vincent Ladeuil]

At file:///v/home/vila/src/plugins/gtk/

------------------------------------------------------------
revno: 203
revision-id: v.ladeuil+lp at free.fr-20070617153359-ge32b244bts8qah8
parent: v.ladeuil+lp at free.fr-20070612145103-x1cxkfcqbp2jq1wz
parent: jelmer at samba.org-20070615160422-rhzp9b3olzp1raf5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: gtk
timestamp: Sun 2007-06-17 17:33:59 +0200
message:
  merge trunk @ 204...
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
    ------------------------------------------------------------
    revno: 199.1.5
    revision-id: jelmer at samba.org-20070615160422-rhzp9b3olzp1raf5
    parent: abentley at panoramicfeedback.com-20070612134907-77hpbkqt7w9mshrq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2007-06-15 18:04:22 +0200
    message:
      Release bzr-gtk 0.17.0
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-06-10 15:50:23 +0000
+++ b/NEWS	2007-06-15 16:04:22 +0000
@@ -1,8 +1,8 @@
-0.17.0  UNRELEASED
+0.17.0  2007-06-15
 
  FEATURES
 
-  * Added an EXPERIMENTAL feature for browsing remote branches (Szilveszter)
+  * Added an EXPERIMENTAL feature for browsing remote branches in Olive (Szilveszter)
 
   * Bookmarked locations are now added to branch/checkout history (Szilveszter)
 
@@ -12,6 +12,8 @@
   * A location bar was added to the top of the file list. On Windows, the
   drive selector combo was moved here (Szilveszter)
 
+  * Don't warn about incompatible versions when .dev version of Bazaar is used (Aaron)
+
  BUG FIXES
  
   * Get and Checkout dialogs: scan the branch only if the entry has lost focus