[Emacs-diffs] /srv/bzr/emacs/trunk r106398: ChangeLog fixes:

[Glenn Morris]

------------------------------------------------------------
revno: 106398
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-16 10:21:51 -0800
message:
  ChangeLog fixes:
  
  python-pdbtrack-stack-entry-regexp was not changed.
  Mark an odd kind of change with no real attribution as tiny.
  Remove conflict marker.
modified:
  lisp/ChangeLog

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-16 17:47:25 +0000
+++ b/lisp/ChangeLog    2011-11-16 18:21:51 +0000
@@ -20,22 +20,15 @@
 
 2011-11-16  Ken Manheimer  <address@hidden>
 
-       * allout-widgets.el: (file metadata): Attribute copyright to FSF
-       and collapse date sequence, obscure author/maintainer email
-       address better, remove extra version line, track relocation of
-       author's allout webpage.
-
-       * allout.el: (file metadata): Attribute copyright to FSF
-       and collapse date sequence, obscure author/maintainer email
-       address better, track relocation of author's allout webpage.
-
-2011-11-16  Ken Manheimer  <address@hidden>
-
-       * python.el (python-pdbtrack-stack-entry-regexp)
-       (python-pdbtrack-input-prompt, python-pdbtrack-track-stack-file):
-       Adjust to recognize ipdb as well as regular python pdb prompts.
-       Adjustments shamelessly taken exactly as suggested in EmacsWiki
-       page: http://www.emacswiki.org/PythonProgrammingInEmacs#toc14
+       * allout.el, allout-widgets.el (file metadata): Attribute copyright to
+       FSF and collapse date sequence, obscure author/maintainer email address
+       better, remove extra version line, track relocation of author's webpage.
+
+       * progmodes/python.el (python-pdbtrack-input-prompt)
+       (python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as
+       regular python pdb prompts.  Adjustments shamelessly taken exactly as
+       suggested in EmacsWiki page (tiny change):
+       http://www.emacswiki.org/PythonProgrammingInEmacs#toc14
 
 2011-11-16  Juanma Barranquero  <address@hidden>
 
@@ -86,7 +79,6 @@
        which wasn't being used.  Add optional arg to force given state.
        (rmail-mime): Add optional arg to force given state.
 
->>>>>>> MERGE-SOURCE
 2011-11-15  Juanma Barranquero  <address@hidden>
 
        * allout.el (allout-encryption-plaintext-sanitization-regexps):