HCoop Git - bpt/emacs.git/history - lisp/vc/smerge-mode.el

[bpt/emacs.git] / lisp / vc / smerge-mode.el

2012-07-10	Stefan Monnier	Reduce use of (require 'cl).	blob \| commitdiff \| raw
2012-07-06	Chong Yidong	Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm...	blob \| commitdiff \| raw \| diff to current
2012-06-29	Glenn Morris	Merge from emacs-24; up to 2012-04-30T11:57:47Z!sdl...	blob \| commitdiff \| raw \| diff to current
2012-06-21	Glenn Morris	Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd...	blob \| commitdiff \| raw \| diff to current
2012-06-17	Chong Yidong	Merge changes from emacs-24; up to 2012-04-26T02:03...	blob \| commitdiff \| raw \| diff to current
2012-06-15	Fabián Ezequiel...	Merge from trunk	blob \| commitdiff \| raw \| diff to current
2012-06-10	Chong Yidong	Merge from emacs-24; up to 2012-04-25T15:23:19Z!sdl...	blob \| commitdiff \| raw \| diff to current
2012-05-31	Chong Yidong	Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael...	blob \| commitdiff \| raw \| diff to current
2012-05-27	Glenn Morris	Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu...	blob \| commitdiff \| raw \| diff to current
2012-05-25	Paul Eggert	Merge from trunk.	blob \| commitdiff \| raw \| diff to current
2012-05-25	Juri Linkov	Use the same diff color scheme as in modern VCSes ...	blob \| commitdiff \| raw \| diff to current
2012-05-14	Chong Yidong	Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd...	blob \| commitdiff \| raw \| diff to current
2012-05-09	Glenn Morris	Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl...	blob \| commitdiff \| raw \| diff to current
2012-05-05	Chong Yidong	Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz...	blob \| commitdiff \| raw \| diff to current
2012-05-04	Stefan Monnier	Add new error and function `user-error'.	blob \| commitdiff \| raw \| diff to current
2012-03-25	Stefan Monnier	Merge from trunk	blob \| commitdiff \| raw \| diff to current
2012-02-10	Paul Eggert	Merge from trunk.	blob \| commitdiff \| raw \| diff to current
2012-02-09	Glenn Morris	Merge from emacs-23; up to 2010-06-29T18:17:31Z!cyd...	blob \| commitdiff \| raw \| diff to current
2012-02-08	Glenn Morris	Minor-mode doc fixes for ARG behavior	blob \| commitdiff \| raw \| diff to current
2012-01-21	Kenichi Handa	merge trunk	blob \| commitdiff \| raw \| diff to current
2012-01-19	Glenn Morris	Merge from emacs-23; up to 2012-01-19T07:15:48Z!rgm...	blob \| commitdiff \| raw \| diff to current
2012-01-13	Eric M. Ludlam	Fix EDE security flaw involving loading arbitrary Lisp...	blob \| commitdiff \| raw \| diff to current
2012-01-09	Paul Eggert	Merge from trunk.	blob \| commitdiff \| raw \| diff to current
2012-01-09	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2012-01-07	Paul Eggert	Merge from trunk.	blob \| commitdiff \| raw \| diff to current
2012-01-05	Glenn Morris	Add 2012 to FSF copyright years for Emacs files	blob \| commitdiff \| raw \| diff to current
2011-11-06	Glenn Morris	Merge from emacs-23; up to 2010-06-22T07:41:10Z!rgm...	blob \| commitdiff \| raw \| diff to current
2011-10-01	Chong Yidong	Merge changes from emacs-23	blob \| commitdiff \| raw \| diff to current
2011-09-18	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2011-08-30	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2011-08-09	Chong Yidong	Merge from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2011-08-05	Eli Zaretskii	Fix bug #9221 with memory leak in bidi display.	blob \| commitdiff \| raw \| diff to current
2011-07-25	Eli Zaretskii	Fix logic of caching display string positions for bidi...	blob \| commitdiff \| raw \| diff to current
2011-07-23	Eli Zaretskii	Fix pos-visible-in-window-p under bidi redisplay.	blob \| commitdiff \| raw \| diff to current
2011-07-23	Eli Zaretskii	Speed up keyboard auto-repeat cursor motion under bidi...	blob \| commitdiff \| raw \| diff to current
2011-07-14	Eli Zaretskii	Support bidi reordering of overlay and display strings.	blob \| commitdiff \| raw \| diff to current
2011-07-07	Chong Yidong	Merge from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2011-07-06	Glenn Morris	Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay...	blob \| commitdiff \| raw \| diff to current
2011-06-25	Glenn Morris	Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm...	blob \| commitdiff \| raw \| diff to current
2011-06-04	Glenn Morris	Merge from emacs-23; up to 2010-06-12T17:12:15Z!cyd...	blob \| commitdiff \| raw \| diff to current
2011-06-04	Eli Zaretskii	Support bidi reordering of text covered by display...	blob \| commitdiff \| raw \| diff to current
2011-06-03	Paul Eggert	* lisp.h (WIDE_EMACS_INT): Now defaults to 1.	blob \| commitdiff \| raw \| diff to current
2011-06-03	Paul Eggert	* fileio.c (Fverify_visited_file_modtime): Avoid time...	blob \| commitdiff \| raw \| diff to current
2011-06-03	Paul Eggert	* dired.c (Ffile_attributes): Don't assume EMACS_INT...	blob \| commitdiff \| raw \| diff to current
2011-06-03	Paul Eggert	* lisp.h: Include <intprops.h>, as it'll useful in...	blob \| commitdiff \| raw \| diff to current
2011-06-03	Paul Eggert	Don't assume time_t can fit into int.	blob \| commitdiff \| raw \| diff to current
2011-06-03	Paul Eggert	Minor fixes for signed vs unsigned integers.	blob \| commitdiff \| raw \| diff to current
2011-06-02	Paul Eggert	Merge: memory_full, gnutls improvements	blob \| commitdiff \| raw \| diff to current
2011-06-02	Juanma Barranquero	Silence warning for unused `dotimes' counter variables.	blob \| commitdiff \| raw \| diff to current
2011-05-29	Glenn Morris	Merge from emacs-23; up to 2010-06-12T11:17:12Z!eliz...	blob \| commitdiff \| raw \| diff to current
2011-05-27	Paul Eggert	Merge: Integer overflow fixes.	blob \| commitdiff \| raw \| diff to current
2011-05-27	Glenn Morris	Merge from emacs-23; up to 2010-06-12T10:58:54Z!romain...	blob \| commitdiff \| raw \| diff to current
2011-05-25	Glenn Morris	Merge from emacs-23; up to 2010-06-12T08:59:37Z!albinus...	blob \| commitdiff \| raw \| diff to current
2011-05-24	Glenn Morris	Merge from emacs-23; up to 2010-06-11T21:26:13Z!lekktu...	blob \| commitdiff \| raw \| diff to current
2011-05-23	Stefan Monnier	* lisp/vc/smerge-mode.el (smerge-refine-subst): Don...	blob \| commitdiff \| raw \| diff to current
2011-05-21	Glenn Morris	Merge from emacs-23; up to 2010-06-11T18:51:00Z!juri...	blob \| commitdiff \| raw \| diff to current
2011-05-17	Glenn Morris	Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd...	blob \| commitdiff \| raw \| diff to current
2011-05-15	Paul Eggert	Merge: user-interface timestamps and other int overflow...	blob \| commitdiff \| raw \| diff to current
2011-05-12	Glenn Morris	Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael...	blob \| commitdiff \| raw \| diff to current
2011-05-05	Glenn Morris	Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm...	blob \| commitdiff \| raw \| diff to current
2011-04-23	Glenn Morris	Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus...	blob \| commitdiff \| raw \| diff to current
2011-04-13	Eli Zaretskii	Fix bug #8487 with invisible text at EOB under bidi.	blob \| commitdiff \| raw \| diff to current
2011-04-11	Eli Zaretskii	Fix bug #8468 with redisplay and scroll-margin > 0.	blob \| commitdiff \| raw \| diff to current
2011-04-09	Glenn Morris	Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann...	blob \| commitdiff \| raw \| diff to current
2011-04-08	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2011-04-01	Paul Eggert	Merge from mainline.	blob \| commitdiff \| raw \| diff to current
2011-04-01	Stefan Monnier	Merge from lexical-binding branch.	blob \| commitdiff \| raw \| diff to current
2011-03-31	Stefan Monnier	Merge from trunk	blob \| commitdiff \| raw \| diff to current
2011-03-21	Stefan Monnier	Merge from trunk	blob \| commitdiff \| raw \| diff to current
2011-03-19	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2011-03-12	Glenn Morris	Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann...	blob \| commitdiff \| raw \| diff to current
2011-03-11	Stefan Monnier	Misc fixes, and use lexical-binding in more files.	blob \| commitdiff \| raw \| diff to current
2011-02-28	Glenn Morris	Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm...	blob \| commitdiff \| raw \| diff to current
2011-02-23	Glenn Morris	Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka...	blob \| commitdiff \| raw \| diff to current
2011-02-19	Glenn Morris	Merge from emacs-23; up to 2010-06-01T01:49:15Z!monnier...	blob \| commitdiff \| raw \| diff to current
2011-02-16	Glenn Morris	Merge from emacs-23; up to 2010-05-28T19:18:47Z!juri...	blob \| commitdiff \| raw \| diff to current
2011-02-12	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2011-02-05	Glenn Morris	Merge from emacs-23; up to 2010-05-26T14:19:15Z!monnier...	blob \| commitdiff \| raw \| diff to current
2011-02-01	Stefan Monnier	Merge from trunk	blob \| commitdiff \| raw \| diff to current
2011-01-31	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2011-01-25	Glenn Morris	Convert consecutive FSF copyright years to ranges.	blob \| commitdiff \| raw \| diff to current
2011-01-25	Glenn Morris	Merge from emacs-23.	blob \| commitdiff \| raw \| diff to current
2011-01-22	Glenn Morris	Merge from emacs-23	blob \| commitdiff \| raw \| diff to current
2011-01-18	Glenn Morris	Merge from emacs-23 branch, up to 2010-05-20T22:16...	blob \| commitdiff \| raw \| diff to current
2011-01-17	Paul Eggert	Merge from mainline.	blob \| commitdiff \| raw \| diff to current
2011-01-15	Glenn Morris	Nuke arch-tags.	blob \| commitdiff \| raw \| diff to current
2011-01-15	Glenn Morris	Merge from emacs-23 branch, up to 2010-05-20T21:33...	blob \| commitdiff \| raw \| diff to current
2011-01-15	Glenn Morris	Merge from emacs-23 branch.	blob \| commitdiff \| raw \| diff to current
2011-01-14	Paul Eggert	Merge from mainline.	blob \| commitdiff \| raw \| diff to current
2011-01-14	Paul Eggert	Merge: make-dist distributes test/ files too.	blob \| commitdiff \| raw \| diff to current
2011-01-14	Paul Eggert	Merge from mainline.	blob \| commitdiff \| raw \| diff to current
2011-01-14	Stefan Monnier	* lisp/vc/smerge-mode.el: Resolve comment conflicts...	blob \| commitdiff \| raw \| diff to current
2011-01-14	Stefan Monnier	Merge from emacs-23	blob \| commitdiff \| raw \| diff to current
2011-01-02	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2010-12-13	Stefan Monnier	Merge from emacs-23	blob \| commitdiff \| raw \| diff to current
2010-12-11	Stefan Monnier	Merge from trunk	blob \| commitdiff \| raw \| diff to current
2010-11-27	Chong Yidong	Merge changes from emacs-23 branch	blob \| commitdiff \| raw \| diff to current
2010-11-20	Eli Zaretskii	faces.el (glyphless-char): Define value for `pc'.	blob \| commitdiff \| raw \| diff to current
2010-11-20	Eli Zaretskii	msdos.c (dos_rawgetc): Use gen_help_event, instead...	blob \| commitdiff \| raw \| diff to current
2010-11-18	Stefan Monnier	Merge from emacs-23	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom