[simspark-cvs] simspark/spark/kerosin/inputserver inputcontrol.cpp, 1.2.2.2.2.1, 1.2.2.2.2.2

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

Update of /cvsroot/simspark/simspark/spark/kerosin/inputserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32494

Modified Files:
      Tag: projectx
	inputcontrol.cpp 
Log Message:
merge from HEAD


Index: inputcontrol.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/inputserver/inputcontrol.cpp,v
retrieving revision 1.2.2.2.2.1
retrieving revision 1.2.2.2.2.2
diff -C2 -d -r1.2.2.2.2.1 -r1.2.2.2.2.2
*** inputcontrol.cpp	1 Jun 2007 12:33:36 -0000	1.2.2.2.2.1
--- inputcontrol.cpp	17 Jun 2007 11:00:13 -0000	1.2.2.2.2.2
***************
*** 84,87 ****
--- 84,92 ----
  }
  
+ shared_ptr<FPSController> InputControl::GetFPSController()
+ {
+     return mFPSController;
+ }
+ 
  void InputControl::SetFPSController(shared_ptr<FPSController> controller)
  {