[asterisk-commits] branch north/chan_skinny-fixup r23379 - in /team/north/chan_skinny-fixup: ./ ...

[asterisk-commits at lists.digium.com]

Author: north
Date: Sat Apr 29 10:21:16 2006
New Revision: 23379

URL: http://svn.digium.com/view/asterisk?rev=23379&view=rev
Log:
Merged revisions 23376,23378 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r23376 | russell | 2006-04-29 08:07:16 -0700 (Sat, 29 Apr 2006) | 2 lines

add aelparse to svn:ignore

........
r23378 | kpfleming | 2006-04-29 08:15:21 -0700 (Sat, 29 Apr 2006) | 2 lines

add the other two files that should have been on this target... oops

........

Modified:
    team/north/chan_skinny-fixup/   (props changed)
    team/north/chan_skinny-fixup/utils/   (props changed)
    team/north/chan_skinny-fixup/utils/Makefile

Propchange: team/north/chan_skinny-fixup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Apr 29 10:21:16 2006
@@ -1,1 +1,1 @@
-/trunk:1-23357
+/trunk:1-23378

Propchange: team/north/chan_skinny-fixup/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Apr 29 10:21:16 2006
@@ -4,3 +4,4 @@
 stereorize
 check_expr
 streamplayer
+aelparse

Modified: team/north/chan_skinny-fixup/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/utils/Makefile?rev=23379&r1=23378&r2=23379&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/utils/Makefile (original)
+++ team/north/chan_skinny-fixup/utils/Makefile Sat Apr 29 10:21:16 2006
@@ -57,7 +57,7 @@
 stereorize: stereorize.o frame.o
 	$(CC) $(CFLAGS) -o stereorize stereorize.o frame.o -lm
 
-.PHONY:	../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o
+.PHONY: ../ast_expr2.o ../ast_expr2f.o ../pbx/ael/aelflex.o ../pbx/ael/aelbison.o ../pbx/pbx_ael.o
 
 ast_expr2.o: ../ast_expr2.c
 	gcc  $(CFLAGS) -include ../include/autoconfig.h -c -o $@ $<