[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Carsten Dominik]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.6921 emacs/lisp/ChangeLog:1.6922
*** emacs/lisp/ChangeLog:1.6921 Tue Jan 25 03:36:37 2005
--- emacs/lisp/ChangeLog        Tue Jan 25 10:24:52 2005
***************
*** 1,3 ****
--- 1,7 ----
+ 2005-01-17  Carsten Dominik  <address@hidden>
+ 
+       * textmodes/org.el (org-version): Unnecessary prefix arg removed. 
+ 
  2005-01-24  Luc Teirlinck  <address@hidden>
  
        * help-at-pt.el (help-at-pt-display-when-idle): Add autoload cookie.
***************
*** 90,95 ****
--- 94,100 ----
        * term/mac-win.el (process-connection-type): Removed.
        Controlled now by s/darwin.h:PTY_ITERATION.
  
+ >>>>>>> 1.6921
  2005-01-20  Stefan Monnier  <address@hidden>
  
        * window.el (handle-select-window): Don't switch window when we're
***************
*** 310,315 ****
--- 315,321 ----
        * ebrowse.el (ebrowse-class-in-tree): Return the tail of the tree
        rather than the element found, thus enabling the tree to be setcar'd.
  
+ >>>>>>> 1.6903
  2005-01-14  Carsten Dominik  <address@hidden>
  
        * textmodes/org.el (org-show-following-heading): New option.