Revision: 8468
http://playerstage.svn.sourceforge.net/playerstage/?rev=8468&view=rev
Author: gbiggs
Date: 2009-12-16 00:58:43 +0000 (Wed, 16 Dec 2009)
Log Message:
-----------
Merged change 8467 from trunk.
Modified Paths:
--------------
code/player/branches/release-3-0-patches/CMakeLists.txt
code/player/branches/release-3-0-patches/ChangeLog
Property Changed:
----------------
code/player/branches/release-3-0-patches/
code/player/branches/release-3-0-patches/client_libs/libplayerc/doc/joydrive.py.doc
code/player/branches/release-3-0-patches/client_libs/libplayerc/doc/simpleclient.c.doc
code/player/branches/release-3-0-patches/client_libs/libplayerc++/bindings/ruby/example.rb.doc
code/player/branches/release-3-0-patches/client_libs/libplayerc++/bindings/ruby/test/
code/player/branches/release-3-0-patches/design/module.c.doc
code/player/branches/release-3-0-patches/design/player.c.doc
code/player/branches/release-3-0-patches/examples/python/playercpp_example.py
code/player/branches/release-3-0-patches/examples/python/playercpy_example.py
code/player/branches/release-3-0-patches/examples/ruby/
code/player/branches/release-3-0-patches/examples/ruby/libplayerc++_ruby_example.rb
code/player/branches/release-3-0-patches/libplayercommon/
code/player/branches/release-3-0-patches/libplayerinterface/
code/player/branches/release-3-0-patches/libplayerinterface/addr_util.c
code/player/branches/release-3-0-patches/libplayerinterface/addr_util.h
code/player/branches/release-3-0-patches/libplayerinterface/interface_util.c
code/player/branches/release-3-0-patches/libplayerinterface/interface_util.h
code/player/branches/release-3-0-patches/libplayerinterface/interfaces/
code/player/branches/release-3-0-patches/libplayerinterface/player.h
code/player/branches/release-3-0-patches/libplayerinterface/playerinterfacegen.py
Property changes on: code/player/branches/release-3-0-patches
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk:6985,8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk:6985,8249-8252,8254-8467
Modified: code/player/branches/release-3-0-patches/CMakeLists.txt
===================================================================
--- code/player/branches/release-3-0-patches/CMakeLists.txt 2009-12-16
00:54:55 UTC (rev 8467)
+++ code/player/branches/release-3-0-patches/CMakeLists.txt 2009-12-16
00:58:43 UTC (rev 8468)
@@ -16,7 +16,7 @@
PROJECT (Player)
STRING (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
# Set the package version
-SET (PLAYER_VERSION 3.0.0 CACHE STRING "Player distribution version")
+SET (PLAYER_VERSION 3.0.1 CACHE STRING "Player distribution version")
SET (PLAYER_API_VERSION 3.0 CACHE STRING "Player API version")
MESSAGE (STATUS "${PROJECT_NAME} version ${PLAYER_VERSION}")
Modified: code/player/branches/release-3-0-patches/ChangeLog
===================================================================
--- code/player/branches/release-3-0-patches/ChangeLog 2009-12-16 00:54:55 UTC
(rev 8467)
+++ code/player/branches/release-3-0-patches/ChangeLog 2009-12-16 00:58:43 UTC
(rev 8468)
@@ -1,3 +1,44 @@
+3.0.1 (2009-12-16)
+ - Fixed incorrect checking of pkg-config package versions.
+ - Fixes for compiling on Windows, including support for pykg-config (see
http://wiki.github.com/gbiggs/pykg-config).
+ - Change license of ptu46 to LGPL.
+ - Reinstate the mbicp and nd drivers now we have confirmation of licensing.
+ - Fix for mclient_peek from Michael Bienia.
+ - Added matlab/octave code form Markus Bader.
+ - Fixed XSensMT compilation.
+ - New driver: blobtracker
+ - New driver: sphereptz
+ - New driver: Several AFSM drivers
+ - New driver: DIO interface drivers
+ - New driver: rangerposeinterpolator
+ - New driver: swissranger
+ - New driver: gridmap
+ - Applied patch 2901126: Fix for PTU46 in "await" mode.
+ - Applied patch 2898272: Allow Playerinterfacegen.py to accept multiple files.
+ - Applied patch 2895525: Enable 500k baud rate in serialstream.cc to support
SICKS300.
+ - Applied patch 2893433: camerav4l2 RGBP mode.
+ - Applied patch 2893427: sphereptz compatibility with older 2.6 kernels.
+ - Applied patch 2891417: cvcam.c memory overrun failure.
+ - Applied patch 2891142: gripcmd win32 compatibility.
+ - Applied patch 2887954: writelog assertions for wifi data are too strict.
+ - Applied patch 2887703: Player 64 bit install path.
+ - Applied patch 2880788: Various ranger device fixes.
+ - Applied patch 2878829: Forward port of checksum fix for p2os.
+ - Applied patch 2878824: The p2os driver doesn't report any position changes.
+ - Applied patch 2875208: camera1394 additional set property message handling.
+ - Applied patch 2871554: changes to camerav4l2.
+ - Applied patch 2871074: Fixed segfault in PlayerClient::Connected().
+ - Applied patch 2865388: playerc_read working incorrectly with data already
on inqueue.
+ - Applied patch 2862998: Remote driver doesn't catch errors thrown in
Disconnect.
+ - Applied patch 2859930: Typos in bitlogic driver.
+ - Applied patch 2859422: goto and globalize rq forwarding issues.
+ - Applied patch 2859118: Add a timeout to a request from a driver.
+ - Applied patch 2858751: writelog, readlog and dummy improvements.
+ - Applied patch 2858511: Uninitialized variable in nd_plugin.cc.
+ - Applied patch 2854278: Exit on empty config file.
+ - Applied patch 2861887: Added checks for non-existent policies.
+ - Applied patch 2847168: core: nanosleep instead of usleep.
+
3.0.0 (2009-09-08)
- Stop building the C++ bindings if the C++ lib isn't being built
- Fixed dependencies of Python and Ruby bindings
Property changes on:
code/player/branches/release-3-0-patches/client_libs/libplayerc/doc/joydrive.py.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc/doc/joydrive.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/doc/joydrive.py:6985
/code/player/trunk/client_libs/libplayerc/doc/joydrive.py.doc:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc/doc/joydrive.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/doc/joydrive.py:6985
/code/player/trunk/client_libs/libplayerc/doc/joydrive.py.doc:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/client_libs/libplayerc/doc/simpleclient.c.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc/doc/simpleclient.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/doc/simpleclient.c:6985
/code/player/trunk/client_libs/libplayerc/doc/simpleclient.c.doc:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc/doc/simpleclient.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/doc/simpleclient.c:6985
/code/player/trunk/client_libs/libplayerc/doc/simpleclient.c.doc:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/client_libs/libplayerc++/bindings/ruby/example.rb.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/example.rb:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb:6985
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb.doc:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/example.rb:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb:6985
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb.doc:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/client_libs/libplayerc++/bindings/ruby/test
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/examples:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/examples:6985
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/test:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/examples:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/examples:6985
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/test:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/design/module.c.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/design/module.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/design/module.c:6985
/code/player/trunk/design/module.c.doc:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/design/module.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/design/module.c:6985
/code/player/trunk/design/module.c.doc:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/design/player.c.doc
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/design/player.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/design/player.c:6985
/code/player/trunk/design/player.c.doc:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/design/player.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/design/player.c:6985
/code/player/trunk/design/player.c.doc:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/examples/python/playercpp_example.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/python/playercpp_example.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/python/playercpp_example.py:6985
/code/player/trunk/examples/python/playercpp_example.py:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/python/playercpp_example.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/python/playercpp_example.py:6985
/code/player/trunk/examples/python/playercpp_example.py:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/examples/python/playercpy_example.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc/bindings/python/playercpy_example.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/bindings/python/playercpy_example.py:6985
/code/player/trunk/examples/python/playercpy_example.py:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc/bindings/python/playercpy_example.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/bindings/python/playercpy_example.py:6985
/code/player/trunk/examples/python/playercpy_example.py:8249-8252,8254-8467
Property changes on: code/player/branches/release-3-0-patches/examples/ruby
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc/bindings/ruby/examples:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/bindings/ruby/examples:6985
/code/player/trunk/examples/ruby:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc/bindings/ruby/examples:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc/bindings/ruby/examples:6985
/code/player/trunk/examples/ruby:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/examples/ruby/libplayerc++_ruby_example.rb
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/example.rb:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb:6985
/code/player/trunk/examples/ruby/libplayerc++_ruby_example.rb:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/client_libs/libplayerc++/bindings/ruby/example.rb:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/client_libs/libplayerc++/bindings/ruby/example.rb:6985
/code/player/trunk/examples/ruby/libplayerc++_ruby_example.rb:8249-8252,8254-8467
Property changes on: code/player/branches/release-3-0-patches/libplayercommon
___________________________________________________________________
Modified: svn:mergeinfo
- /code/player/trunk/libplayercommon:8249-8252,8254-8458
+ /code/player/trunk/libplayercommon:8249-8252,8254-8467
Property changes on: code/player/branches/release-3-0-patches/libplayerinterface
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayerxdr:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayerinterface:8249-8252,8254-8458
/code/player/trunk/libplayerxdr:6985
+
/code/player/branches/release-2-1-patches/libplayerxdr:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayerinterface:8249-8252,8254-8467
/code/player/trunk/libplayerxdr:6985
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/addr_util.c
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/addr_util.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/addr_util.c:6985
/code/player/trunk/libplayerinterface/addr_util.c:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/libplayercore/addr_util.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/addr_util.c:6985
/code/player/trunk/libplayerinterface/addr_util.c:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/addr_util.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/addr_util.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/addr_util.h:6985
/code/player/trunk/libplayerinterface/addr_util.h:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/libplayercore/addr_util.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/addr_util.h:6985
/code/player/trunk/libplayerinterface/addr_util.h:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/interface_util.c
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/interface_util.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interface_util.c:6985
/code/player/trunk/libplayerinterface/interface_util.c:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/libplayercore/interface_util.c:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interface_util.c:6985
/code/player/trunk/libplayerinterface/interface_util.c:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/interface_util.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/interface_util.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interface_util.h:6985
/code/player/trunk/libplayerinterface/interface_util.h:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/libplayercore/interface_util.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interface_util.h:6985
/code/player/trunk/libplayerinterface/interface_util.h:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/interfaces
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/interfaces:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interfaces:6985
/code/player/trunk/libplayerinterface/interfaces:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/libplayercore/interfaces:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/interfaces:6985
/code/player/trunk/libplayerinterface/interfaces:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/player.h
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/player.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/player.h:6985
/code/player/trunk/libplayerinterface/player.h:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/libplayercore/player.h:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/player.h:6985
/code/player/trunk/libplayerinterface/player.h:8249-8252,8254-8467
Property changes on:
code/player/branches/release-3-0-patches/libplayerinterface/playerinterfacegen.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches/libplayercore/playerinterfacegen.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/playerinterfacegen.py:6985
/code/player/trunk/libplayerinterface/playerinterfacegen.py:8249-8252,8254-8458
+
/code/player/branches/release-2-1-patches/libplayercore/playerinterfacegen.py:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk/libplayercore/playerinterfacegen.py:6985
/code/player/trunk/libplayerinterface/playerinterfacegen.py:8249-8252,8254-8467
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
