HCoop
/
bpt
/
emacs.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅ next
Auto-commit of generated files.
[bpt/emacs.git]
/
admin
/
bzrmerge.el
2011-05-17
Glenn Morris
Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd...
blob
|
commitdiff
|
raw
2011-05-12
Glenn Morris
Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael...
blob
|
commitdiff
|
raw
2011-05-05
Glenn Morris
Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm...
blob
|
commitdiff
|
raw
2011-04-23
Glenn Morris
Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus...
blob
|
commitdiff
|
raw
2011-04-09
Glenn Morris
Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann...
blob
|
commitdiff
|
raw
2011-04-08
Chong Yidong
Merge changes from emacs-23 branch
blob
|
commitdiff
|
raw
2011-03-19
Chong Yidong
Merge changes from emacs-23 branch
blob
|
commitdiff
|
raw
2011-03-12
Glenn Morris
Merge from emacs-23; up to 2010-06-03T22:16:02Z!dann...
blob
|
commitdiff
|
raw
2011-03-06
Stefan Monnier
Merge from trunk
blob
|
commitdiff
|
raw
2011-02-28
Glenn Morris
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm...
blob
|
commitdiff
|
raw
2011-02-25
Paul Eggert
Merge from mainline.
blob
|
commitdiff
|
raw
2011-02-23
Glenn Morris
Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka...
blob
|
commitdiff
|
raw
2011-02-23
Glenn Morris
Add comments about fixing dates in merged ChangeLogs.
blob
|
commitdiff
|
raw
2011-02-21
Stefan Monnier
Merge from trunk
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-15
Paul Eggert
Merge from mainline.
blob
|
commitdiff
|
raw
|
diff to current
2011-02-13
Chong Yidong
Merge changes from emacs-23 branch
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-12
Glenn Morris
* admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert...
blob
|
commitdiff
|
raw
|
diff to current
2011-02-12
Stefan Monnier
Merge from trunk
blob
|
commitdiff
|
raw
|
diff to current
2011-02-05
Glenn Morris
bzrmerge.el trivia.
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-03
Glenn Morris
bzrmerge.el trivia.
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
Make it easier to control which revisions bzrmerge...
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-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 Eggert
Merge from mainline.
blob
|
commitdiff
|
raw
|
diff to current
2011-01-15
Glenn Morris
bzrmerge.el trivia.
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
Stefan Monnier
Merge from emacs-23
blob
|
commitdiff
|
raw
|
diff to current
2011-01-14
Paul Eggert
Merge 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 Eggert
Merge 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 Yidong
Merge 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