HCoop / bpt / emacs.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca
[bpt/emacs.git] / admin / bzrmerge.el
2011-05-24 Glenn MorrisMerge from emacs-23; up to 2010-06-11T21:26:13Z!lekktu... blob | commitdiff | raw
2011-05-23 Paul EggertMerge from trunk. blob | commitdiff | raw
2011-05-21 Glenn Morris* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompt... blob | commitdiff | raw
2011-05-21 Glenn MorrisMerge from emacs-23; up to 2010-06-11T18:51:00Z!juri... blob | commitdiff | raw | diff to current
2011-05-17 Glenn MorrisMerge from emacs-23; up to 2010-06-11T14:39:54Z!cyd... blob | commitdiff | raw | diff to current
2011-05-12 Glenn MorrisMerge from emacs-23; up to 2010-06-10T12:56:11Z!michael... blob | commitdiff | raw | diff to current
2011-05-05 Glenn MorrisMerge from emacs-23; up to 2010-06-10T05:17:21Z!rgm... blob | commitdiff | raw | diff to current
2011-04-23 Glenn MorrisMerge from emacs-23; up to 2010-06-09T17:54:28Z!albinus... blob | commitdiff | raw | diff to current
2011-04-09 Glenn MorrisMerge from emacs-23; up to 2010-06-08T03:06:47Z!dann... blob | commitdiff | raw | diff to current
2011-04-08 Chong YidongMerge changes from emacs-23 branch blob | commitdiff | raw | diff to current
2011-03-19 Chong YidongMerge changes from emacs-23 branch blob | commitdiff | raw | diff to current
2011-03-12 Glenn MorrisMerge from emacs-23; up to 2010-06-03T22:16:02Z!dann... blob | commitdiff | raw | diff to current
2011-03-06 Stefan MonnierMerge from trunk blob | commitdiff | raw | diff to current
2011-02-28 Glenn MorrisMerge from emacs-23; up to 2010-06-03T05:41:49Z!rgm... blob | commitdiff | raw | diff to current
2011-02-25 Paul EggertMerge from mainline. blob | commitdiff | raw | diff to current
2011-02-23 Glenn MorrisMerge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka... blob | commitdiff | raw | diff to current
2011-02-23 Glenn MorrisAdd comments about fixing dates in merged ChangeLogs. blob | commitdiff | raw | diff to current
2011-02-21 Stefan MonnierMerge from trunk blob | commitdiff | raw | diff to current
2011-02-19 Glenn MorrisMerge from emacs-23; up to 2010-06-01T01:49:15Z!monnier... blob | commitdiff | raw | diff to current
2011-02-16 Glenn MorrisMerge from emacs-23; up to 2010-05-28T19:18:47Z!juri... blob | commitdiff | raw | diff to current
2011-02-15 Paul EggertMerge from mainline. blob | commitdiff | raw | diff to current
2011-02-13 Chong YidongMerge changes from emacs-23 branch blob | commitdiff | raw | diff to current
2011-02-12 Chong YidongMerge changes from emacs-23 branch blob | commitdiff | raw | diff to current
2011-02-12 Glenn Morris* admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert... blob | commitdiff | raw | diff to current
2011-02-12 Stefan MonnierMerge from trunk blob | commitdiff | raw | diff to current
2011-02-05 Glenn Morrisbzrmerge.el trivia. blob | commitdiff | raw | diff to current
2011-02-05 Glenn MorrisMerge from emacs-23; up to 2010-05-26T14:19:15Z!monnier... blob | commitdiff | raw | diff to current
2011-02-03 Glenn Morrisbzrmerge.el trivia. blob | commitdiff | raw | diff to current
2011-02-01 Stefan MonnierMerge from trunk blob | commitdiff | raw | diff to current
2011-01-31 Chong YidongMerge changes from emacs-23 branch blob | commitdiff | raw | diff to current
2011-01-25 Glenn MorrisMake it easier to control which revisions bzrmerge... blob | commitdiff | raw | diff to current
2011-01-25 Glenn MorrisConvert consecutive FSF copyright years to ranges. blob | commitdiff | raw | diff to current
2011-01-25 Glenn MorrisMerge from emacs-23. blob | commitdiff | raw | diff to current
2011-01-22 Glenn MorrisMerge from emacs-23 blob | commitdiff | raw | diff to current
2011-01-18 Glenn MorrisMerge from emacs-23 branch, up to 2010-05-20T22:16... blob | commitdiff | raw | diff to current
2011-01-18 Glenn Morris* admin/bzrmerge.el: Fix paren typo in previous. blob | commitdiff | raw | diff to current
2011-01-17 Stefan Monnier* admin/bzrmerge.el (bzrmerge-apply): Warn the user... blob | commitdiff | raw | diff to current
2011-01-17 Paul EggertMerge from mainline. blob | commitdiff | raw | diff to current
2011-01-15 Glenn Morrisbzrmerge.el trivia. blob | commitdiff | raw | diff to current
2011-01-15 Glenn MorrisMerge from emacs-23 branch, up to 2010-05-20T21:33... blob | commitdiff | raw | diff to current
2011-01-15 Glenn MorrisMerge from emacs-23 branch. blob | commitdiff | raw | diff to current
2011-01-14 Stefan MonnierMerge from emacs-23 blob | commitdiff | raw | diff to current
2011-01-14 Paul EggertMerge from mainline. blob | commitdiff | raw | diff to current
2011-01-14 Glenn Morris* admin/bzrmerge.el: Require cl when compiling. blob | commitdiff | raw | diff to current
2011-01-12 Paul EggertMerge from mainline. blob | commitdiff | raw | diff to current
2011-01-12 Glenn Morris* admin/bzrmerge.el: Standardize copyright and license... blob | commitdiff | raw | diff to current
2011-01-02 Chong YidongMerge changes from emacs-23 branch blob | commitdiff | raw | diff to current
2010-12-27 Stefan Monnier* admin/bzrmerge.el: New file to help merge branches... blob | commitdiff | raw | diff to current
Unnamed repository; edit this file 'description' to name the repository.