[asterisk-commits] trunk - r7341 in /trunk: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Dec  5 00:50:04 2005
New Revision: 7341

URL: http://svn.digium.com/view/asterisk?rev=7341&view=rev
Log:
Merged revisions 7340 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7340 | russell | 2005-12-05 01:47:51 -0500 (Mon, 05 Dec 2005) | 2 lines

remove ASTERISKVERSIONNUM from the version string given to doxygen

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Dec  5 00:50:04 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7337
+/branches/1.2:1-7340

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=7341&r1=7340&r2=7341&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Dec  5 00:50:04 2005
@@ -829,7 +829,7 @@
 
 progdocs:
 	(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
-	echo "PROJECT_NUMBER=$(ASTERISKVERSION)  -  $(ASTERISKVERSIONNUM)") | doxygen - 
+	echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - 
 
 mpg123:
 	@wget -V >/dev/null || (echo "You need wget" ; false )