changeset 2116:8aaa6f29c3ca trunk

[svn] - ar should pick changes
author yaz
date Wed, 13 Dec 2006 00:38:32 -0800
parents 13da6ea5e4da
children 5dc1bfb0ac99
files ChangeLog mk/objective.mk
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Dec 12 23:13:46 2006 -0800
+++ b/ChangeLog	Wed Dec 13 00:38:32 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-13 07:13:46 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3235]
+  - make sure fd is not NULL before checking it's URI namespace
+  
+  trunk/audacious/input.c |    4 ++--
+  1 file changed, 2 insertions(+), 2 deletions(-)
+
+
 2006-12-13 07:13:01 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3233]
   - at present, only use extension filtering in the file:// namespace.
--- a/mk/objective.mk	Tue Dec 12 23:13:46 2006 -0800
+++ b/mk/objective.mk	Wed Dec 13 00:38:32 2006 -0800
@@ -191,7 +191,7 @@
 	if [ "x$(OBJECTS)" != "x" ]; then \
 		$(MAKE) $(OBJECTS) || exit;		\
 		printf "%10s     %-20s\n" LINK $@; \
-		$(AR) cq $@ $(OBJECTS); \
+		$(AR) cr $@ $(OBJECTS); \
 	fi
 
 $(OBJECTIVE_BINS): $(OBJECTS)