Revision: 42334
          http://brlcad.svn.sourceforge.net/brlcad/?rev=42334&view=rev
Author:   starseeker
Date:     2011-01-16 21:34:07 +0000 (Sun, 16 Jan 2011)

Log Message:
-----------
Sync cmake to trunk r42333.

Modified Paths:
--------------
    brlcad/branches/cmake/AUTHORS
    brlcad/branches/cmake/misc/enigma/Makefile.am
    brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.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
   + 
/brlcad/trunk:37932-39894,41673-41706,41994-41998,42011-42052,42060-42120,42240-42327,42329-42333

Modified: brlcad/branches/cmake/AUTHORS
===================================================================
--- brlcad/branches/cmake/AUTHORS       2011-01-16 21:23:58 UTC (rev 42333)
+++ brlcad/branches/cmake/AUTHORS       2011-01-16 21:34:07 UTC (rev 42334)
@@ -739,7 +739,11 @@
 2010 July
 Open Source
 
+Sayol, Jordi
+2011 January
+Open Source
 
+
 CORPORATE AND ORGANIZATION SUPPORT
 ----------------------------------
 

Modified: brlcad/branches/cmake/misc/enigma/Makefile.am
===================================================================
--- brlcad/branches/cmake/misc/enigma/Makefile.am       2011-01-16 21:23:58 UTC 
(rev 42333)
+++ brlcad/branches/cmake/misc/enigma/Makefile.am       2011-01-16 21:34:07 UTC 
(rev 42334)
@@ -13,6 +13,7 @@
        INSTALL \
        NEWS \
        README \
+       crypt.c \
        configure.ac
 
 DISTCLEANFILES = \

Modified: brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c
===================================================================
--- brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c        2011-01-16 
21:23:58 UTC (rev 42333)
+++ brlcad/branches/cmake/src/libtclcad/tclcadAutoPath.c        2011-01-16 
21:34:07 UTC (rev 42334)
@@ -36,8 +36,6 @@
 #  include "tk.h"
 #endif
 
-#include "brlcad_config.h"
-
 #ifndef ITCL_VERSION
 #  include "itcl.h"
 #endif


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
   + 
/brlcad/trunk/src/other/tkhtml:37932-39894,40417,41673-41706,42011-42052,42060-42120,42240-42327,42329-42333


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

Reply via email to