code.delx.au - gnu-emacs/history - lisp/vc/ediff-util.el

]> code.delx.au - gnu-emacs/history - lisp/vc/ediff-util.el

2015-01-01	Paul Eggert	Update copyright year to 2015	blob \| commitdiff \| raw
2015-01-01	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-28	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-28	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-28	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-27	Fabián Ezequiel...	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-13	Andreas Schwab	Merge remote-tracking branch 'origin/emacs-24'	blob \| commitdiff \| raw \| diff to current
2014-12-05	Stefan Monnier	Merge from emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-05	Stefan Monnier	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-05	Stefan Monnier	Merge from emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-05	Stefan Monnier	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-12-05	Stefan Monnier	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2014-11-29	Paul Eggert	Merge branch 'emacs-24'.	blob \| commitdiff \| raw \| diff to current
2014-11-27	Ted Zlatanov	Merge branch 'emacs-24'	blob \| commitdiff \| raw \| diff to current
2014-11-16	Stefan Monnier	Merge from emacs-24	blob \| commitdiff \| raw \| diff to current
2014-11-10	Glenn Morris	Merge from emacs-24; up to 117702	blob \| commitdiff \| raw \| diff to current
2014-11-10	Glenn Morris	Merge from emacs-24; up to 117698	blob \| commitdiff \| raw \| diff to current
2014-11-09	Glenn Morris	Merge from emacs-24; up to 117691	blob \| commitdiff \| raw \| diff to current
2014-11-08	Glenn Morris	Merge from emacs-24; up to 117689	blob \| commitdiff \| raw \| diff to current
2014-11-08	Glenn Morris	Merge from emacs-24; up to 117687	blob \| commitdiff \| raw \| diff to current
2014-11-05	Glenn Morris	Merge from emacs-24; up to 117669	blob \| commitdiff \| raw \| diff to current
2014-11-03	Glenn Morris	Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt...	blob \| commitdiff \| raw \| diff to current
2014-11-01	Glenn Morris	Merge from emacs-24; up to 117656	blob \| commitdiff \| raw \| diff to current
2014-10-30	Glenn Morris	Merge from emacs-24; up to 117634	blob \| commitdiff \| raw \| diff to current
2014-10-21	Stefan Monnier	Merge from emacs-24	blob \| commitdiff \| raw \| diff to current
2014-10-20	Glenn Morris	Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantip...	blob \| commitdiff \| raw \| diff to current
2014-10-17	Glenn Morris	Merge from emacs-24; up to 2014-07-28T02:47:29Z!fgallin...	blob \| commitdiff \| raw \| diff to current
2014-10-16	Glenn Morris	Merge from emacs-24; up to 2014-07-27T18:05:37Z!eliz...	blob \| commitdiff \| raw \| diff to current
2014-10-15	Glenn Morris	Merge from emacs-24; up to 2014-07-27T09:41:59Z!ttn...	blob \| commitdiff \| raw \| diff to current
2014-10-13	Glenn Morris	Merge from emacs-24; up to 2014-07-27T01:00:26Z!fgallin...	blob \| commitdiff \| raw \| diff to current
2014-10-13	Glenn Morris	Merge from emacs-24; up to 2014-07-26T12:14:42Z!schwab...	blob \| commitdiff \| raw \| diff to current
2014-10-12	Glenn Morris	Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab...	blob \| commitdiff \| raw \| diff to current
2014-10-09	Glenn Morris	Merge from emacs-24; up to 2014-07-22T06:37:31Z!yamaoka...	blob \| commitdiff \| raw \| diff to current
2014-10-05	Glenn Morris	Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier...	blob \| commitdiff \| raw \| diff to current
2014-10-04	Glenn Morris	Merge from emacs-24; up to 2014-07-20T16:14:58Z!dmantip...	blob \| commitdiff \| raw \| diff to current
2014-10-03	Glenn Morris	Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantip...	blob \| commitdiff \| raw \| diff to current
2014-10-03	Glenn Morris	Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm...	blob \| commitdiff \| raw \| diff to current
2014-10-02	Stefan Monnier	Merge from emacs-24	blob \| commitdiff \| raw \| diff to current
2014-09-30	Stefan Monnier	Merge from emacs-24	blob \| commitdiff \| raw \| diff to current
2014-09-22	Stefan Monnier	Merge from emacs-24	blob \| commitdiff \| raw \| diff to current
2014-09-15	Glenn Morris	Merge from emacs-24; up to 2014-07-09T02:04:12Z!rgm...	blob \| commitdiff \| raw \| diff to current
2014-09-08	Glenn Morris	Merge from emacs-24; up to 2014-07-08T06:24:07Z!eggert...	blob \| commitdiff \| raw \| diff to current
2014-09-03	Glenn Morris	Merge from emacs-24; up to 2014-07-04T02:28:54Z!dmantip...	blob \| commitdiff \| raw \| diff to current
2014-08-28	Glenn Morris	Merge from emacs-24; up to 2014-07-02T00:57:53Z!juri...	blob \| commitdiff \| raw \| diff to current
2014-08-15	Glenn Morris	Merge from emacs-24; up to 2014-06-29T18:32:35Z!michael...	blob \| commitdiff \| raw \| diff to current
2014-08-11	Glenn Morris	Merge from emacs-24; up to 2014-06-28T23:35:17Z!rgm...	blob \| commitdiff \| raw \| diff to current
2014-08-03	Glenn Morris	Merge from emacs-24; up to 2014-06-27T16:27:08Z!rgm...	blob \| commitdiff \| raw \| diff to current
2014-08-01	Eli Zaretskii	Merge from emacs-24; up to 2014-06-26T21:51:25Z!rgm...	blob \| commitdiff \| raw \| diff to current
2014-07-28	Glenn Morris	Merge from emacs-24; up to 2014-06-26T06:55:15Z!rgm...	blob \| commitdiff \| raw \| diff to current
2014-07-25	Glenn Morris	ediff: Replace obsolete toggle-read-only with read...	blob \| commitdiff \| raw \| diff to current
2014-05-04	Paul Eggert	Merge from emacs-24; up to 2014-05-04T21:18:30Z!eggert...	blob \| commitdiff \| raw \| diff to current
2014-05-03	Stefan Monnier	* lisp/vc/ediff-diff.el (ediff-set-fine-diff-properties...	blob \| commitdiff \| raw \| diff to current
2014-04-11	Glenn Morris	Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotav...	blob \| commitdiff \| raw \| diff to current
2014-04-10	Stefan Monnier	Ediff's overlay priorities cause more trouble than...	blob \| commitdiff \| raw \| diff to current
2014-02-24	Bill Wohler	Merge from trunk; up to 2014-02-23T23:41:17Z!lekktu...	blob \| commitdiff \| raw \| diff to current
2014-01-01	Paul Eggert	Update copyright year to 2014 by running admin/update...	blob \| commitdiff \| raw \| diff to current
2013-11-23	Glenn Morris	Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm...	blob \| commitdiff \| raw \| diff to current
2013-09-17	Glenn Morris	Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm...	blob \| commitdiff \| raw \| diff to current
2013-09-05	Eli Zaretskii	Merge from trunk after a lot of time.	blob \| commitdiff \| raw \| diff to current
2013-09-05	Daniel Hackney	* lisp/dired-x.el:	blob \| commitdiff \| raw \| diff to current
2013-09-04	Xue Fuqiao	Merge from mainline.	blob \| commitdiff \| raw \| diff to current
2013-08-27	Glenn Morris	Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm...	blob \| commitdiff \| raw \| diff to current
2013-08-13	Glenn Morris	Merge from emacs-24; up to 2013-01-02T16:37:04Z!eggert...	blob \| commitdiff \| raw \| diff to current
2013-08-12	Glenn Morris	Merge from emacs-24; up to 2013-01-02T10:15:31Z!michael...	blob \| commitdiff \| raw \| diff to current
2013-08-05	Dmitry Antipov	Do not call to `selected-window' where it is assumed...	blob \| commitdiff \| raw \| diff to current
2013-08-05	Dmitry Antipov	Do not call to `selected-frame' where it is assumed...	blob \| commitdiff \| raw \| diff to current
2013-07-25	Glenn Morris	Merge from emacs-24; up to 2013-01-01T11:02:14Z!rudalic...	blob \| commitdiff \| raw \| diff to current
2013-07-20	Glenn Morris	Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalic...	blob \| commitdiff \| raw \| diff to current
2013-07-06	Glenn Morris	Merge from emacs-24; up to 2012-12-30T19:34:25Z!jan...	blob \| commitdiff \| raw \| diff to current
2013-07-03	Glenn Morris	Merge from emacs-24; up to 2012-12-29T12:57:49Z!fgallin...	blob \| commitdiff \| raw \| diff to current
2013-06-24	Glenn Morris	Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd...	blob \| commitdiff \| raw \| diff to current
2013-06-14	Stephen Berman	Merge from trunk.	blob \| commitdiff \| raw \| diff to current
2013-06-01	Glenn Morris	Merge from emacs-24; up to 2012-12-27T20:09:45Z!juri...	blob \| commitdiff \| raw \| diff to current
2013-05-23	Kenichi Handa	merge trunk	blob \| commitdiff \| raw \| diff to current
2013-05-23	Glenn Morris	Silence ediff compilation	blob \| commitdiff \| raw \| diff to current
2013-05-09	Glenn Morris	Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm...	blob \| commitdiff \| raw \| diff to current
2013-04-26	Glenn Morris	Merge from emacs-24; up to 2012-12-27T08:21:08Z!rgm...	blob \| commitdiff \| raw \| diff to current
2013-04-20	Glenn Morris	Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka...	blob \| commitdiff \| raw \| diff to current
2013-03-30	Glenn Morris	Merge from emacs-24; up to 2012-12-26T16:22:18Z!michael...	blob \| commitdiff \| raw \| diff to current
2013-03-28	Eli Zaretskii	Merge from trunk and resolve conflicts.	blob \| commitdiff \| raw \| diff to current
2013-03-16	Stefan Monnier	Merge from emacs-24	blob \| commitdiff \| raw \| diff to current
2013-03-11	Glenn Morris	Merge from emacs-24; up to 2012-12-25T17:37:29Z!eliz...	blob \| commitdiff \| raw \| diff to current
2013-03-08	Glenn Morris	Merge from emacs-24; up to 2012-12-25T15:07:59Z!dmantip...	blob \| commitdiff \| raw \| diff to current
2013-03-06	Glenn Morris	Merge from emacs-24; up to 2012-12-25T11:37:21Z!dmantip...	blob \| commitdiff \| raw \| diff to current
2013-03-05	Glenn Morris	Merge from emacs-24; up to 2012-12-24T15:56:17Z!eliz...	blob \| commitdiff \| raw \| diff to current
2013-03-03	Glenn Morris	Merge from emacs-24; up to 2012-12-24T06:24:08Z!eggert...	blob \| commitdiff \| raw \| diff to current
2013-03-02	Bill Wohler	Merge from trunk; up to 2013-03-02T21:05:52Z!eggert...	blob \| commitdiff \| raw \| diff to current
2013-03-02	Glenn Morris	Merge from emacs-24; up to 2012-12-23T17:06:58Z!eliz...	blob \| commitdiff \| raw \| diff to current
2013-02-28	Glenn Morris	Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm...	blob \| commitdiff \| raw \| diff to current
2013-02-24	Glenn Morris	Merge from emacs-24; up to 2012-12-22T19:09:52Z!rgm...	blob \| commitdiff \| raw \| diff to current
2013-02-23	Glenn Morris	Add bug-gnu-emacs to some specialized bug report addresses	blob \| commitdiff \| raw \| diff to current
next

RSS Atom