- Committer: Canonical.com Patch Queue Manager
- Date: 2006-07-02 19:48:18 UTC
- mfrom: (1551.7.13 Aaron's mergeable stuff)
- Revision ID: pqm@pqm.ubuntu.com-20060702194818-ba2ec54220591dcf
Remerge doesn't clobber conflicts on other files
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
configuration.txt |
1770.2.2 | 18 years ago | Aaron Bentley | Rename branches.conf to locations.conf | 4.3 KB |
|
|
|
plugins.txt |
1610.2.2 | 18 years ago | James Blackwell | Now they look good in rst2html | 2.9 KB |
|
|
|
README.1st |
1610.2.2 | 18 years ago | James Blackwell | Now they look good in rst2html | 936 bytes |
|
|
|
setting_up_email.txt |
1770.2.2 | 18 years ago | Aaron Bentley | Rename branches.conf to locations.conf | 3 KB |
|
|
|
specifying_revisions.txt |
1610.2.2 | 18 years ago | James Blackwell | Now they look good in rst2html | 4 KB |
|
|
|
tutorial.txt |
1770.2.3 | 18 years ago | Aaron Bentley | Merge from dev | 17.7 KB |
|
|
|
using_aliases.txt |
1610.2.2 | 18 years ago | James Blackwell | Now they look good in rst2html | 1.7 KB |
|
|