Author: bkuhn
Date: Sat Oct 11 15:44:51 2008
New Revision: 4693
URL: http://svn.gna.org/viewcvs/pokersource?rev=4693&view=rev
Log:
Merged in trunk to the coverage branch
Merge commit 'svn/trunk' into bkuhn/coverage-poker-network
Conflicts:
poker-network/ChangeLog
Modified:
branches/coverage-poker-network/jpoker/css/jpoker.css
branches/coverage-poker-network/jpoker/css/jpoker_jquery_ui/dialog.css
branches/coverage-poker-network/jpoker/css/jpoker_login.css
branches/coverage-poker-network/jpoker/css/jpoker_regular_tourney_list.css
branches/coverage-poker-network/jpoker/css/jpoker_server_status.css
branches/coverage-poker-network/jpoker/css/jpoker_sitngo_tourney_list.css
branches/coverage-poker-network/jpoker/css/jpoker_table.css
branches/coverage-poker-network/jpoker/css/jpoker_table_list.css
branches/coverage-poker-network/jpoker/css/jpoker_tablesorter_pager.css
branches/coverage-poker-network/jpoker/css/jpoker_tourney_details.css
branches/coverage-poker-network/jpoker/images/table.svg
branches/coverage-poker-network/jpoker/index-en.html
branches/coverage-poker-network/jpoker/index-fr.html
branches/coverage-poker-network/jpoker/index-ja.html
branches/coverage-poker-network/jpoker/index.html
branches/coverage-poker-network/jpoker/js/jquery.jpoker.js
branches/coverage-poker-network/jpoker/js/skin-jpoker.js
branches/coverage-poker-network/jpoker/js/test-jpoker.js
branches/coverage-poker-network/poker-network/ChangeLog
branches/coverage-poker-network/poker-network/pokernetwork/packets.py
branches/coverage-poker-network/poker-network/pokernetwork/pokerexplain.py
branches/coverage-poker-network/poker-network/pokernetwork/pokerpackets.py
branches/coverage-poker-network/poker-network/pokernetwork/pokerservice.py
branches/coverage-poker-network/poker-network/tests/test-pokerexplain.py.in
branches/coverage-poker-network/poker-network/tests/test-pokerservice.py.in
branches/coverage-poker-network/poker-network/tests/test-protocol.py.in
_______________________________________________
Pokersource-commits mailing list
[email protected]
https://mail.gna.org/listinfo/pokersource-commits
