diff options
| author | Deepak Goel <deego@gnufans.org> | 2007-12-06 17:18:13 +0000 |
|---|---|---|
| committer | Deepak Goel <deego@gnufans.org> | 2007-12-06 17:18:13 +0000 |
| commit | fd0c71e869db245bf4304373b6dd5ec5160b8642 (patch) | |
| tree | 9808f7c2ac40ec9d2417fb35d79c46bbe573a7d6 /lisp/progmodes/ada-xref.el | |
| parent | 2e564b0dc50d873996148f653797b46441f0b061 (diff) | |
| download | emacs-fd0c71e869db245bf4304373b6dd5ec5160b8642.tar.gz emacs-fd0c71e869db245bf4304373b6dd5ec5160b8642.tar.bz2 emacs-fd0c71e869db245bf4304373b6dd5ec5160b8642.zip | |
Resolve commit conflict.
Diffstat (limited to 'lisp/progmodes/ada-xref.el')
0 files changed, 0 insertions, 0 deletions