From 52d4cd2e91408dec22f46c3c1a8f05d252560437 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Wed, 23 Jul 2014 08:49:17 -0700 Subject: Resolve conflict with origin/master --- Completion/Unix/Command/_nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Completion') diff --git a/Completion/Unix/Command/_nm b/Completion/Unix/Command/_nm index 5638014d6..3ceb8c932 100644 --- a/Completion/Unix/Command/_nm +++ b/Completion/Unix/Command/_nm @@ -21,7 +21,7 @@ case $state in _alternative \ "object-files:object file:_path_files -g '*.o'" \ "executable-files:executable file:_path_files -g '*(*)'" \ - "dynamic-libraries:dynamic library:_path_files -g '*.so'" \ + "dynamic-libraries:dynamic library:_path_files -g '*.so(.*)#'" \ "static-libraries:static library:_path_files -g '*.a'" \ "directories:directory:_path_files -g '*(/)'" && ret=0 ;; -- cgit 1.4.1