Author: bkuhn
Date: Tue Jan 27 02:19:39 2009
New Revision: 5474
URL: http://svn.gna.org/viewcvs/pokersource?rev=5474&view=rev
Log:
Merge commit 'svn/trunk' into bkuhn/coverage-poker-network
Conflicts:
poker-network/tests/test-pokerservice.py.in
There had been changes in trunk related to pokerservice, which is the
thing I'm trying to cover.
Added:
branches/coverage-poker-network/poker-network/pokerprizes/schema.sql.in
- copied, changed from r5459,
branches/coverage-poker-network/poker-network/pokerprizes/schema.sql
branches/coverage-poker-network/poker-network/tests/testsettings.xml
branches/coverage-poker-network/poker-network/tests/testtourney_select_info.py
- copied, changed from r5459,
branches/coverage-poker-network/poker-network/pokerprizes/tourneyselectinfo.py
branches/coverage-poker-network/poker-network/tests/testtourney_select_info_no_call.py
Removed:
branches/coverage-poker-network/poker-network/pokernetwork/tourneyattrs.py
branches/coverage-poker-network/poker-network/pokerprizes/schema.sql
branches/coverage-poker-network/poker-network/tests/test-tourneyattrs.py.in
Modified:
branches/coverage-poker-network/poker-network/ChangeLog
branches/coverage-poker-network/poker-network/Makefile.am
branches/coverage-poker-network/poker-network/conf/poker.server.xml.in
branches/coverage-poker-network/poker-network/configure.ac
branches/coverage-poker-network/poker-network/debian/control
branches/coverage-poker-network/poker-network/debian/control.dapper
branches/coverage-poker-network/poker-network/debian/control.edgy
branches/coverage-poker-network/poker-network/debian/control.etch
branches/coverage-poker-network/poker-network/debian/control.feisty
branches/coverage-poker-network/poker-network/debian/control.gutsy
branches/coverage-poker-network/poker-network/debian/control.hardy
branches/coverage-poker-network/poker-network/debian/control.intrepid
branches/coverage-poker-network/poker-network/debian/control.jaunty
branches/coverage-poker-network/poker-network/debian/control.lenny
branches/coverage-poker-network/poker-network/debian/control.unstable
branches/coverage-poker-network/poker-network/pokernetwork/pokeravatar.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/pokernetwork/pokersql.py
branches/coverage-poker-network/poker-network/pokerprizes/Makefile.am
branches/coverage-poker-network/poker-network/pokerprizes/prizes.py
branches/coverage-poker-network/poker-network/pokerprizes/test-prizes.py.in
branches/coverage-poker-network/poker-network/pokerprizes/tourneyselectinfo.py
branches/coverage-poker-network/poker-network/pokerstats/poker.stats.xml.in
branches/coverage-poker-network/poker-network/tests/Makefile.am
branches/coverage-poker-network/poker-network/tests/test-pokeravatar.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
