Author: bkuhn
Date: Sun Nov  9 16:04:07 2008
New Revision: 4878

URL: http://svn.gna.org/viewcvs/pokersource?rev=4878&view=rev
Log:
Merged in current state of trunk so that more-coverage branch does not drift to 
far from it

Merge commit 'svn/trunk' into bkuhn/more-cover-poker-network

Added:
    branches/more-cover-poker-network/icm-calculator/
    branches/more-cover-poker-network/icm-calculator/icm-webservice.py   (with 
props)
    branches/more-cover-poker-network/icm-calculator/icm.html
    branches/more-cover-poker-network/icm-calculator/icm.js
    branches/more-cover-poker-network/icm-calculator/jquery.js   (with props)
    branches/more-cover-poker-network/icm-calculator/style.css   (with props)
    branches/more-cover-poker-network/poker-engine/debian/control.intrepid
    branches/more-cover-poker-network/poker-engine/debian/control.jaunty
    branches/more-cover-poker-network/poker-network/debian/control.intrepid
      - copied, changed from r4750, 
branches/more-cover-poker-network/poker-network/debian/control.dapper
    branches/more-cover-poker-network/poker-network/debian/control.jaunty
      - copied, changed from r4750, 
branches/more-cover-poker-network/poker-network/debian/control.dapper
    
branches/more-cover-poker-network/poker-network/debian/python-poker-stats.cron.hourly
    branches/more-cover-poker-network/poker-network/twisted/
    branches/more-cover-poker-network/poker-network/twisted/plugins/
    
branches/more-cover-poker-network/poker-network/twisted/plugins/pokernetwork_plugin.py
    branches/more-cover-poker-network/pypoker-eval/debian/control.hardy
    branches/more-cover-poker-network/pypoker-eval/debian/control.intrepid
    branches/more-cover-poker-network/pypoker-eval/debian/control.jaunty
Modified:
    branches/more-cover-poker-network/.gitignore
    branches/more-cover-poker-network/jpoker/css/jpoker_table.css
    branches/more-cover-poker-network/jpoker/css/jpoker_tourney_details.css
    branches/more-cover-poker-network/jpoker/js/jquery.jpoker.js
    branches/more-cover-poker-network/jpoker/js/jquery.tablesorter.pager.js
    branches/more-cover-poker-network/jpoker/js/skin-jpoker.js
    branches/more-cover-poker-network/jpoker/js/test-jpoker.js
    branches/more-cover-poker-network/jpoker/l10n/jpoker-fr.json
    branches/more-cover-poker-network/jpoker/l10n/jpoker-ja.json
    branches/more-cover-poker-network/poker-engine/po/fr.po
    branches/more-cover-poker-network/poker-engine/po/poker-engine.pot
    branches/more-cover-poker-network/poker-network/ChangeLog
    branches/more-cover-poker-network/poker-network/Makefile.am
    branches/more-cover-poker-network/poker-network/conf/poker.server.xml.in
    branches/more-cover-poker-network/poker-network/database/1.0.11-1.0.12.sql
    branches/more-cover-poker-network/poker-network/database/1.0.30-1.0.31.sql
    branches/more-cover-poker-network/poker-network/database/1.6.0-1.7.0.sql
    branches/more-cover-poker-network/poker-network/database/schema.sql.in
    branches/more-cover-poker-network/poker-network/debian/control
    branches/more-cover-poker-network/poker-network/debian/control.dapper
    branches/more-cover-poker-network/poker-network/debian/control.lenny
    branches/more-cover-poker-network/poker-network/debian/control.unstable
    branches/more-cover-poker-network/poker-network/debian/poker-web.prerm
    
branches/more-cover-poker-network/poker-network/debian/python-poker-network.init
    
branches/more-cover-poker-network/poker-network/debian/python-poker-network.install
    branches/more-cover-poker-network/poker-network/po/ChangeLog
    branches/more-cover-poker-network/poker-network/po/fr.po
    branches/more-cover-poker-network/poker-network/pokernetwork/attrpack.py
    branches/more-cover-poker-network/poker-network/pokernetwork/pokeravatar.py
    branches/more-cover-poker-network/poker-network/pokernetwork/pokerexplain.py
    
branches/more-cover-poker-network/poker-network/pokernetwork/pokermemcache.py
    branches/more-cover-poker-network/poker-network/pokernetwork/pokerpackets.py
    branches/more-cover-poker-network/poker-network/pokernetwork/pokerserver.py
    branches/more-cover-poker-network/poker-network/pokernetwork/pokerservice.py
    branches/more-cover-poker-network/poker-network/pokernetwork/pokersite.py
    branches/more-cover-poker-network/poker-network/pokernetwork/pokertable.py
    branches/more-cover-poker-network/poker-network/pokernetwork/proxyfilter.py
    branches/more-cover-poker-network/poker-network/pokernetwork/tourneyattrs.py
    
branches/more-cover-poker-network/poker-network/pokerstats/poker.stats.xml.in
    branches/more-cover-poker-network/poker-network/pokerstats/stats.py
    branches/more-cover-poker-network/poker-network/pokerstats/statslogic.py
    branches/more-cover-poker-network/poker-network/pokerstats/test-stats.py.in
    
branches/more-cover-poker-network/poker-network/tests/test-clientserver.py.in
    branches/more-cover-poker-network/poker-network/tests/test-pokeravatar.py.in
    
branches/more-cover-poker-network/poker-network/tests/test-pokerexplain.py.in
    branches/more-cover-poker-network/poker-network/tests/test-pokerlock.py.in
    
branches/more-cover-poker-network/poker-network/tests/test-pokerservice.py.in
    branches/more-cover-poker-network/poker-network/tests/test-pokersite.py.in
    branches/more-cover-poker-network/poker-network/tests/test-pokertable.py.in
    branches/more-cover-poker-network/poker-network/tests/test-proxyfilter.py.in
    branches/more-cover-poker-network/poker-network/tests/upgrade.in


_______________________________________________
Pokersource-commits mailing list
[email protected]
https://mail.gna.org/listinfo/pokersource-commits

Reply via email to