merge trunk

2 files changed, 6 insertions, 2 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2c1e3758ea0..099d7ca044f 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,6 +1,7 @@
 2012-09-30  Jan Djärv  <jan.h.d@swipnet.se>
 
         * NEWS: The NS port supports fullscreen.
+        Mention that the file dialog is used on NS.
 
 2012-09-17  Glenn Morris  <rgm@gnu.org>
 
diff --git a/etc/NEWS b/etc/NEWS
index e6f09d83f43..2791a25e051 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -187,8 +187,11 @@ The PCL-CVS commands are still available via the keyboard.
 ---
 *** New input method `vietnamese-vni'.
 
-** The NS port supports fullscreen.
-
+** NextStep/OSX port changes.
+---
+*** Fullscreen and frame parameter fullscreen is supported.
+---
+*** A file dialog is used when open/saved is done from the menu/toolbar.
 
 * Editing Changes in Emacs 24.3