diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-28 00:06:01 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-28 00:06:01 +0000 |
| commit | c566e16d9ee1d925626b24bb84f497ffba88986a (patch) | |
| tree | fa28441137d7aa168c9a0a0a6ea139235a94f7b4 /debian | |
| parent | 62462ca5fbf273549f00a7936b10898cb611c528 (diff) | |
| download | ikiwiki-c566e16d9ee1d925626b24bb84f497ffba88986a.tar ikiwiki-c566e16d9ee1d925626b24bb84f497ffba88986a.tar.gz | |
* Improve use of svn merge, by specifying the file to merge, rather than
chdiring to the srcdir (which wasn't right when merging in a subdir).
Thanks Ethan.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 483d14b12..7a0e362d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,11 @@ ikiwiki (1.41) UNRELEASED; urgency=low * Make gitorigin_branch and gitmaster_branch configurable via the setup file. Closes: #408599 * French translation update. Closes: #408593 + * Improve use of svn merge, by specifying the file to merge, rather than + chdiring to the srcdir (which wasn't right when merging in a subdir). + Thanks Ethan. - -- Joey Hess <joeyh@debian.org> Sat, 27 Jan 2007 18:56:49 -0500 + -- Joey Hess <joeyh@debian.org> Sat, 27 Jan 2007 19:01:27 -0500 ikiwiki (1.40) unstable; urgency=low |