Revision: 42381
http://brlcad.svn.sourceforge.net/brlcad/?rev=42381&view=rev
Author: starseeker
Date: 2011-01-17 07:40:27 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
sync cmake to r42380
Modified Paths:
--------------
brlcad/branches/cmake/configure.ac
brlcad/branches/cmake/src/other/tkpng/generic/tkImgPNGInit.c
Property Changed:
----------------
brlcad/branches/cmake/
brlcad/branches/cmake/src/other/tkhtml/
Property changes on: brlcad/branches/cmake
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378
+
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380
Modified: brlcad/branches/cmake/configure.ac
===================================================================
--- brlcad/branches/cmake/configure.ac 2011-01-17 07:38:45 UTC (rev 42380)
+++ brlcad/branches/cmake/configure.ac 2011-01-17 07:40:27 UTC (rev 42381)
@@ -3230,7 +3230,7 @@
dnl *** tkpng ***
dnl figure out whether we need to build tkpng
-TKPNG_VERSION="0.9"
+TKPNG_VERSION="0.8"
TKPNG_LIB_FILE="tkpng${SHLIB_SUFFIX}"
case $host_os in
*netbsd-*|*freebsd-[[1-3]]*.*|*openbsd-[[1-3]]*|*sunos4*)
Property changes on: brlcad/branches/cmake/src/other/tkhtml
___________________________________________________________________
Modified: svn:mergeinfo
-
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378
+
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376,42378-42380
Modified: brlcad/branches/cmake/src/other/tkpng/generic/tkImgPNGInit.c
===================================================================
--- brlcad/branches/cmake/src/other/tkpng/generic/tkImgPNGInit.c
2011-01-17 07:38:45 UTC (rev 42380)
+++ brlcad/branches/cmake/src/other/tkpng/generic/tkImgPNGInit.c
2011-01-17 07:40:27 UTC (rev 42381)
@@ -17,7 +17,7 @@
#include <tk.h>
#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "0.9"
+#define PACKAGE_VERSION "0.8"
#endif
extern Tk_PhotoImageFormat tkImgFmtPNG;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
