merge trunk

2 files changed, 9 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index ad6c6395e49..001bfe271af 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-07  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * NEWS (NextStep/OSX port changes): OSX 10.4 or newer is required.
+
 2012-10-05  Douglas Lewan  <d_lewan2000@yahoo.com>  (tiny change)
 
         * tutorials/TUTORIAL.pt_BR: Fix typo.  (Bug#12557)
diff --git a/etc/NEWS b/etc/NEWS
index be75b665c1d..1a7eb82967d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -191,6 +191,8 @@ The PCL-CVS commands are still available via the keyboard.
 
 ** NextStep/OSX port changes.
 ---
+*** OSX 10.4 or newer is required to build Emacs.
+---
 *** Fullscreen and frame parameter fullscreen is supported.
 ---
 *** A file dialog is used when open/saved is done from the menu/toolbar.
@@ -281,6 +283,9 @@ Use `Buffer-menu-name-width' and `Buffer-menu-size-width' instead.
 *** You can customize the header text that appears above each calendar month.
 See the variable `calendar-month-header'.
 
++++
+*** New LaTeX calendar style, produced by `cal-tex-cursor-week2-summary'.
+
 *** The calendars produced by cal-html include holidays.
 Customize cal-html-holidays to change this.