diff options
author | Joey Hess <joey@gnu.kitenet.net> | 2009-06-11 14:39:08 -0400 |
---|---|---|
committer | Joey Hess <joey@gnu.kitenet.net> | 2009-06-11 14:39:08 -0400 |
commit | 7bbc9917c046d06f7d7e8d7cad10b9e3b27a8ec9 (patch) | |
tree | a6bfa98f7ff3c043111e6523f7d7c688600f87b9 /doc | |
parent | 45d6698e772aa6990d6b27a98325cc228d7004fd (diff) | |
parent | 15a4917aa7ccfc33b99fd44ba8eb07ab431f81f7 (diff) | |
download | debhelper-7bbc9917c046d06f7d7e8d7cad10b9e3b27a8ec9.tar.gz |
Merge branch 'master' into buildsystems
Conflicts:
debian/changelog
Diffstat (limited to 'doc')
-rw-r--r-- | doc/TODO | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -30,4 +30,4 @@ Deprecated: * Convert warning about unknown command-line options back to an error. Need to wait a while (from Oct 2008) to ensure that most rules files that pass unknown options to commands are fixed. -* dh_desktop. Remove eventually.. +* dh_desktop, dh_scrollkeeper. Remove eventually.. |