HCoop Git - bpt/emacs.git/history

2008-01-16	Dan Nicolaescu	* smerge-mode.el (smerge-start-session): Rename from...	blob \| commitdiff \| raw
2008-01-15	Stefan Monnier	(smerge-refine): Also work on "same change conflicts".	blob \| commitdiff \| raw \| diff to current
2008-01-14	Dan Nicolaescu	* smerge-mode.el (smerge-auto): New function.	blob \| commitdiff \| raw \| diff to current
2008-01-08	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2008-01-07	Glenn Morris	Add 2008 to copyright years.	blob \| commitdiff \| raw \| diff to current
2008-01-02	Miles Bader	Merge from emacs--rel--22, gnus--devo--0	blob \| commitdiff \| raw \| diff to current
2007-12-28	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-12-16	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-12-06	Miles Bader	Merge from emacs--rel--22, gnus--devo--0	blob \| commitdiff \| raw \| diff to current
2007-12-06	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-11-21	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-11-19	Dan Nicolaescu	* progmodes/octave-mod.el (inferior-octave-send-list...	blob \| commitdiff \| raw \| diff to current
2007-11-11	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-11-09	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-11-08	Stefan Monnier	(smerge-refine-subst): Pass "-d" to diff.	blob \| commitdiff \| raw \| diff to current
2007-10-30	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-30	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-27	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-20	Dan Nicolaescu	* term/x-win.el (x-gtk-stock-map, icon-map-list)	blob \| commitdiff \| raw \| diff to current
2007-10-20	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-20	Stefan Monnier	(smerge-auto-refine): New var.	blob \| commitdiff \| raw \| diff to current
2007-10-19	Stefan Monnier	Add word-granularity refinement.	blob \| commitdiff \| raw \| diff to current
2007-10-18	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-18	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-16	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-15	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-09	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-10-09	Stefan Monnier	(smerge-refine-chopup-region): Add `preproc' argument.	blob \| commitdiff \| raw \| diff to current
2007-08-21	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-08-21	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-08-16	Stefan Monnier	(smerge-resolve): New arg `safe'.	blob \| commitdiff \| raw \| diff to current
2007-07-31	Miles Bader	Merge from emacs--devo--0	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-26	Miles Bader	Merge from emacs--rel--22	blob \| commitdiff \| raw \| diff to current
2007-07-25	Glenn Morris	Switch license to GPLv3 or later.	blob \| commitdiff \| raw \| diff to current
2007-04-22	Karoly Lorentey	Merged from emacs@sv.gnu.org	blob \| commitdiff \| raw \| diff to current
2007-03-08	Stefan Monnier	(smerge-remove-props): Don't mark the buffer modified.	blob \| commitdiff \| raw \| diff to current
2007-01-29	Karoly Lorentey	Merged from emacs@sv.gnu.org	blob \| commitdiff \| raw \| diff to current
2007-01-21	Glenn Morris	Add 2007 to copyright years.	blob \| commitdiff \| raw \| diff to current
2006-05-03	Karoly Lorentey	Merged from emacs@sv.gnu.org	blob \| commitdiff \| raw \| diff to current
2006-04-30	Stefan Monnier	Update my email address.	blob \| commitdiff \| raw \| diff to current
2006-02-12	Karoly Lorentey	Merged from emacs@sv.gnu.org	blob \| commitdiff \| raw \| diff to current
2006-02-06	Thien-Thi Nguyen	Update years in copyright notice; nfc.	blob \| commitdiff \| raw \| diff to current
2005-11-01	Karoly Lorentey	Merged from miles@gnu.org--gnu-2005 (patch 142-148...	blob \| commitdiff \| raw \| diff to current
2005-10-26	Romain Francoise	Add 'tools' to file keywords.	blob \| commitdiff \| raw \| diff to current
2005-10-09	Karoly Lorentey	Merged from miles@gnu.org--gnu-2005 (patch 118-132...	blob \| commitdiff \| raw \| diff to current
2005-09-23	Stefan Monnier	(smerge-remove-props): Cause re-highlighting of the...	blob \| commitdiff \| raw \| diff to current
2005-09-09	Karoly Lorentey	Merged in changes from CVS trunk.	blob \| commitdiff \| raw \| diff to current
2005-09-09	Richard M. Stallman	(smerge-resolve): Pass args to smerge-remove-props.	blob \| commitdiff \| raw \| diff to current
2005-09-04	Karoly Lorentey	Merged in changes from CVS trunk. Plus added lisp...	blob \| commitdiff \| raw \| diff to current
2005-08-26	Juanma Barranquero	(smerge-refined-change): Add :group.	blob \| commitdiff \| raw \| diff to current
2005-08-25	Stefan Monnier	(smerge-remove-props): Make the args non-optional.	blob \| commitdiff \| raw \| diff to current
2005-08-22	Stefan Monnier	(smerge-basic-map): Bind smerge-combine-with-next.	blob \| commitdiff \| raw \| diff to current
2005-08-06	Thien-Thi Nguyen	Update years in copyright notice; nfc.	blob \| commitdiff \| raw \| diff to current
2005-07-26	Stefan Monnier	(smerge-ediff): Use insert-buffer-substring.	blob \| commitdiff \| raw \| diff to current
2005-07-05	Karoly Lorentey	Merged from miles@gnu.org--gnu-2005 (patch 469)	blob \| commitdiff \| raw \| diff to current
2005-07-05	Karoly Lorentey	Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449...	blob \| commitdiff \| raw \| diff to current
2005-07-04	Lute Kamstra	Update FSF's address.	blob \| commitdiff \| raw \| diff to current
2005-07-03	Richard M. Stallman	(smerge-mode): Add duplicate defvar near top.	blob \| commitdiff \| raw \| diff to current
2005-06-21	Karoly Lorentey	Merged from miles@gnu.org--gnu-2005 (patch 423-434)	blob \| commitdiff \| raw \| diff to current
2005-06-16	Juanma Barranquero	(smerge-ensure-match): Don't use `format' on `error...	blob \| commitdiff \| raw \| diff to current
2005-06-15	Karoly Lorentey	Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350...	blob \| commitdiff \| raw \| diff to current
2005-06-10	Miles Bader	Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk...	blob \| commitdiff \| raw \| diff to current
2005-04-11	Karoly Lorentey	Merged from miles@gnu.org--gnu-2005 (patch 59, 240...	blob \| commitdiff \| raw \| diff to current
2005-04-08	Dan Nicolaescu	* mh-customize.el (mh-speedbar-selected-folder-face...	blob \| commitdiff \| raw \| diff to current
2005-04-04	Karoly Lorentey	Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214...	blob \| commitdiff \| raw \| diff to current
2005-04-04	Lute Kamstra	(smerge-mode): Specify :group.	blob \| commitdiff \| raw \| diff to current
2004-05-01	Karoly Lorentey	Merged in changes from CVS trunk.	blob \| commitdiff \| raw \| diff to current
2004-04-30	Juanma Barranquero	(smerge-diff-switches): Fix typo in docstring.	blob \| commitdiff \| raw \| diff to current
2004-04-16	Karoly Lorentey	Merged in changes from CVS trunk.	blob \| commitdiff \| raw \| diff to current
2004-04-15	Stefan Monnier	(smerge-match-conflict): Fix last change.	blob \| commitdiff \| raw \| diff to current
2004-04-15	Stefan Monnier	(smerge-match-conflict): Try to do something sensible	blob \| commitdiff \| raw \| diff to current
2004-04-15	Karoly Lorentey	Merged in changes from CVS trunk.	blob \| commitdiff \| raw \| diff to current
2004-04-14	Stefan Monnier	(smerge-popup-context-menu): Use it.	blob \| commitdiff \| raw \| diff to current
2004-03-25	Karoly Lorentey	Merged in changes from CVS HEAD	blob \| commitdiff \| raw \| diff to current
2004-03-23	Stefan Monnier	(smerge-mode-menu): Fix activate pred for resolve.	blob \| commitdiff \| raw \| diff to current
2004-03-19	Karoly Lorentey	Merged in changes from CVS HEAD	blob \| commitdiff \| raw \| diff to current
2004-03-16	Karoly Lorentey	Merged in changes from CVS HEAD	blob \| commitdiff \| raw \| diff to current
2004-03-16	Masatake YAMATO	(smerge-popup-context-menu): Put `unwind-protect' arrou...	blob \| commitdiff \| raw \| diff to current
2004-03-15	Masatake YAMATO	2004-03-15 Masatake YAMATO <jet@gyve.org>	blob \| commitdiff \| raw \| diff to current
2004-03-11	Karoly Lorentey	Merged in changes from CVS HEAD	blob \| commitdiff \| raw \| diff to current
2004-03-10	Stefan Monnier	(smerge-check-cache, smerge-check): New var and fun.	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom