[simspark-cvs] simspark/spark/plugin/rosimporter Makefile.am, 1.2, 1.3 rosimporter.cpp, 1.9, 1.10

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/plugin/rosimporter
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/plugin/rosimporter

Modified Files:
	Makefile.am rosimporter.cpp 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rosimporter/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	18 Feb 2006 19:53:06 -0000	1.2
--- Makefile.am	15 Mar 2007 07:26:28 -0000	1.3
***************
*** 4,7 ****
--- 4,8 ----
  	export.cpp \
  	roselements.cpp\
+ 	roselements.h \
  	rosimporter.cpp\
  	rosimporter.h \

Index: rosimporter.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/plugin/rosimporter/rosimporter.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rosimporter.cpp	23 Feb 2006 13:40:23 -0000	1.9
--- rosimporter.cpp	15 Mar 2007 07:26:28 -0000	1.10
***************
*** 21,25 ****
  */
  #include "rosimporter.h"
- #include <GL/glu.h>
  #include <tinyxml/xmlfunctions.h>
  #include <zeitgeist/logserver/logserver.h>
--- 21,24 ----