diff options
| author | Jon Masters <jcm@jonmasters.org> | 2011-06-02 13:55:01 -0400 |
|---|---|---|
| committer | Jon Masters <jcm@jonmasters.org> | 2011-06-02 13:55:01 -0400 |
| commit | 4026aad8bfb89d62bdf300694c92ee911c51968c (patch) | |
| tree | 220dfe4ea8eeedd9f2134a56c42a494e90df5a91 | |
| parent | f8e51716464f623e0fe09de68a401080c1b15952 (diff) | |
| parent | f357bb28c6b8810ad08bffad2e8403dfff53edc1 (diff) | |
| download | module-init-tools-4026aad8bfb89d62bdf300694c92ee911c51968c.tar.gz | |
Merge branch 'dev'
Conflicts:
ChangeLog
Signed-off-by: Jon Masters <jcm@jonmasters.org>
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | modprobe.d.5 | 1 |
3 files changed, 4 insertions, 2 deletions
@@ -1,3 +1,6 @@ +3.16 Version: +o build: missed a top-level cached copy of modprobe.d.5 which broke builds + 3.15 Version: o build: properly fix man page creation symlink handling o doc: remove invalid multiple output files from docbook markup diff --git a/configure.ac b/configure.ac index 339e4c9..b085178 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(module-init-tools,3.15) +AC_INIT(module-init-tools,3.16) AC_CANONICAL_SYSTEM diff --git a/modprobe.d.5 b/modprobe.d.5 deleted file mode 100644 index d0ed026..0000000 --- a/modprobe.d.5 +++ /dev/null @@ -1 +0,0 @@ -.so modprobe.conf.5 |