[tor-commits] [flashproxy/master] merged move of com into main branch

[dcf at torproject.org]

commit 6c616f701d878246f82b59df0cf4415a861f6ff8
Merge: fd7c1d3 b875382
Author: ellitron <jdellit at stanford.edu>
Date:   Wed May 25 11:06:13 2011 -0700

    merged move of com into main branch

 Makefile                                      |    2 +-
 README                                        |   88 ++++---
 badge.png                                     |  Bin 264 -> 682 bytes
 badge_con_counter.png                         |  Bin 270 -> 0 bytes
 com/rtmfpcat/Makefile                         |   11 -
 com/rtmfpcat/README                           |  118 ---------
 com/rtmfpcat/Utils.as                         |   25 --
 com/rtmfpcat/connector.py                     |  326 -------------------------
 com/rtmfpcat/facilitator.py                   |  146 -----------
 com/rtmfpcat/rtmfp/RTMFPSocket.as             |  232 ------------------
 com/rtmfpcat/rtmfp/RTMFPSocketClient.as       |   57 -----
 com/rtmfpcat/rtmfp/events/RTMFPSocketEvent.as |   25 --
 com/rtmfpcat/rtmfpcat.as                      |  208 ----------------
 connector.py                                  |    4 +-
 facilitator.py                                |   11 +-
 nat-birthday.py                               |  132 ----------
 notes.txt                                     |    2 -
 rtmfp/RTMFPSocket.as                          |  232 ++++++++++++++++++
 rtmfp/RTMFPSocketClient.as                    |   57 +++++
 rtmfp/events/RTMFPSocketEvent.as              |   24 ++
 rtmfpcat.as                                   |  237 ++++++++++++++++++
 swfcat.as                                     |  230 +++++++++++++-----
 22 files changed, 778 insertions(+), 1389 deletions(-)