Merge from trunk.

1 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ae8ab9420a8..0504fb006a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2012-04-21  Paul Eggert  <eggert@cs.ucla.edu>
+2012-04-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix integer width and related bugs (Bug#9874).
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -790,6 +790,17 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2012-04-22  Leo Liu  <sdl.web@gmail.com>
+
+        * sysdep.c (list_system_processes): Support Darwin (Bug#5725).
+
+2012-04-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * sysdep.c [__FreeBSD__]: Minor cleanups.
+        (list_system_processes, system_process_attributes) [__FreeBSD__]:
+        Use Emacs indenting style more consistently.  Avoid some casts.
+        Use 'double' consistently rather than mixing 'float' and 'double'.
+
 2012-04-21  Eduard Wiebe  <usenet@pusto.de>
 
         * sysdep.c (list_system_processes, system_process_attributes): Add