Revision: 42377
http://brlcad.svn.sourceforge.net/brlcad/?rev=42377&view=rev
Author: starseeker
Date: 2011-01-17 07:03:47 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Update cmake branch to trunk r42376
Modified Paths:
--------------
brlcad/branches/cmake/src/other/incrTcl/Makefile.am
brlcad/branches/cmake/src/other/incrTcl/itk/Makefile.am
brlcad/branches/cmake/src/util/bw-imp.c
Added Paths:
-----------
brlcad/branches/cmake/doc/docbook/log4j.properties
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
+
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376
Added: brlcad/branches/cmake/doc/docbook/log4j.properties
===================================================================
--- brlcad/branches/cmake/doc/docbook/log4j.properties
(rev 0)
+++ brlcad/branches/cmake/doc/docbook/log4j.properties 2011-01-17 07:03:47 UTC
(rev 42377)
@@ -0,0 +1,13 @@
+
+#set the level of the root logger and set its appender
+# as an appender named X
+#log4j.rootLogger = WARN, X
+#log4j.rootLogger = ERROR, X
+log4j.rootLogger = FATAL, X
+
+#set the appender named X to be a console appender
+log4j.appender.X=org.apache.log4j.ConsoleAppender
+
+#set the layout for the appender X
+log4j.appender.X.layout=org.apache.log4j.PatternLayout
+log4j.appender.X.layout.conversionPattern=%-5p - %m%n
Property changes on: brlcad/branches/cmake/doc/docbook/log4j.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: brlcad/branches/cmake/src/other/incrTcl/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/Makefile.am 2011-01-17 06:58:19 UTC
(rev 42376)
+++ brlcad/branches/cmake/src/other/incrTcl/Makefile.am 2011-01-17 07:03:47 UTC
(rev 42377)
@@ -29,7 +29,6 @@
CHANGES \
INCOMPATIBLE \
license.terms \
- makefile.bc \
makefile.vc \
rules.vc \
tclconfig
Modified: brlcad/branches/cmake/src/other/incrTcl/itk/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/Makefile.am 2011-01-17
06:58:19 UTC (rev 42376)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/Makefile.am 2011-01-17
07:03:47 UTC (rev 42377)
@@ -16,7 +16,6 @@
examples \
itkConfig.sh.in \
license.terms \
- mac \
tests \
win
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
+
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333,42350-42352,42372-42376
Modified: brlcad/branches/cmake/src/util/bw-imp.c
===================================================================
--- brlcad/branches/cmake/src/util/bw-imp.c 2011-01-17 06:58:19 UTC (rev
42376)
+++ brlcad/branches/cmake/src/util/bw-imp.c 2011-01-17 07:03:47 UTC (rev
42377)
@@ -184,7 +184,7 @@
im_hpatches = ((height * im_mag)+31) / 32;
if (im_wpatches*32 > 2560) {
fprintf(stderr, "bw-imp: output %d too wide, limit is 2560\n",
- im_wpatches*32);
+ (int)im_wpatches*32);
return 1;
}
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
