Author: bkuhn
Date: Tue Sep 30 22:30:37 2008
New Revision: 4660
URL: http://svn.gna.org/viewcvs/pokersource?rev=4660&view=rev
Log:
Merging in current trunk status into my coverage-poker-network branch.
Not sure exactly why I got conflicts, but I resolved them in favor of
trunk jpoker (and brought in my ChangeLog entries) of course.
Merge commit 'svn/trunk' into bkuhn/coverage-poker-network
Conflicts:
jpoker/js/skin-jpoker.js
poker-network/ChangeLog
Modified:
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
_______________________________________________
Pokersource-commits mailing list
[email protected]
https://mail.gna.org/listinfo/pokersource-commits
