Author: bkuhn Date: Sun Jun 28 16:56:19 2009 New Revision: 5963 URL: http://svn.gna.org/viewcvs/pokersource?rev=5963&view=rev Log: Merged table-picker-bug-13787 branch into packet-table-bug-13771
Loic approved the patch for table-picker-bug-13787 on the pokersource-users email list: https://mail.gna.org/public/pokersource-users/2009-06/msg00040.html Therefore, I expect that branch will be merged into trunk before this one, and I expected I'd be generating more conflicts here from that branch as I continued working. Modified: branches/packet-table-bug-13771/poker-network/ChangeLog branches/packet-table-bug-13771/poker-network/pokernetwork/pokeravatar.py branches/packet-table-bug-13771/poker-network/pokernetwork/pokerpackets.py branches/packet-table-bug-13771/poker-network/tests/test-pokeravatar.py.in _______________________________________________ Pokersource-commits mailing list [email protected] https://mail.gna.org/listinfo/pokersource-commits
