Author: bkuhn
Date: Sun Nov 30 18:27:25 2008
New Revision: 5088
URL: http://svn.gna.org/viewcvs/pokersource?rev=5088&view=rev
Log:
Merge commit trunk into agpl-source-provision-feature: tracking trunk status in
this branch to ease later merging.
Conflicts:
poker-engine/ChangeLog
Added:
branches/agpl-source-provision-feature/jpoker/index-da.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-de.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-en_CA.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-en_US.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-es.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-fi.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-fr_BE.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-fr_CA.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-fr_FX.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-it.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-nb.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-nl.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-pt.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/index-sv.html
- copied, changed from r5046,
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-da.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-de.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-en.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-en_CA.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-en_US.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-es.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-fi.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-fr_BE.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-fr_CA.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-fr_FX.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-it.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-nb.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-nl.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-pt.json
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-sv.json
Removed:
branches/agpl-source-provision-feature/poker-engine/po/stamp-po
Modified:
branches/agpl-source-provision-feature/jpoker/css/jpoker_table.css
branches/agpl-source-provision-feature/jpoker/index-en.html
branches/agpl-source-provision-feature/jpoker/index-fr.html
branches/agpl-source-provision-feature/jpoker/index-ja.html
branches/agpl-source-provision-feature/jpoker/index.html
branches/agpl-source-provision-feature/jpoker/js/jquery.jpoker.js
branches/agpl-source-provision-feature/jpoker/js/printstacktrace.js
branches/agpl-source-provision-feature/jpoker/js/test-jpoker.js
branches/agpl-source-provision-feature/jpoker/js/test-printstacktrace.js
branches/agpl-source-provision-feature/jpoker/l10n/jpoker-fr.json
branches/agpl-source-provision-feature/poker-engine/ChangeLog
branches/agpl-source-provision-feature/poker-engine/NEWS
branches/agpl-source-provision-feature/poker-engine/debian/changelog
branches/agpl-source-provision-feature/poker-engine/pokerengine/__init__.py
branches/agpl-source-provision-feature/poker-network/ChangeLog
branches/agpl-source-provision-feature/poker-network/NEWS
branches/agpl-source-provision-feature/poker-network/conf/poker.bot.xml.in
branches/agpl-source-provision-feature/poker-network/conf/poker.client.xml.in
branches/agpl-source-provision-feature/poker-network/conf/poker.server.xml.in
branches/agpl-source-provision-feature/poker-network/database/1.6.0-1.7.0.sql
branches/agpl-source-provision-feature/poker-network/database/schema.sql.in
branches/agpl-source-provision-feature/poker-network/debian/changelog
branches/agpl-source-provision-feature/poker-network/examples/poker.bot.xml
branches/agpl-source-provision-feature/poker-network/examples/poker.server-monotone.xml
branches/agpl-source-provision-feature/poker-network/examples/poker.server.xml
branches/agpl-source-provision-feature/poker-network/pokerclient2d/poker2d.xml.in
branches/agpl-source-provision-feature/poker-network/pokernetwork/__init__.py
branches/agpl-source-provision-feature/poker-network/pokernetwork/pokeravatar.py
branches/agpl-source-provision-feature/poker-network/pokernetwork/pokerpackets.py
branches/agpl-source-provision-feature/poker-network/pokernetwork/pokerservice.py
branches/agpl-source-provision-feature/poker-network/pokernetwork/pokersite.py
branches/agpl-source-provision-feature/poker-network/pokernetwork/pokertable.py
branches/agpl-source-provision-feature/poker-network/tests/conf/poker.client.xml.in
branches/agpl-source-provision-feature/poker-network/tests/test-pokeravatar.py.in
branches/agpl-source-provision-feature/poker-network/tests/test-pokerservice.py.in
branches/agpl-source-provision-feature/poker-network/tests/test-pokersite.py.in
branches/agpl-source-provision-feature/poker-network/tests/test-pokertable.py.in
_______________________________________________
Pokersource-commits mailing list
[email protected]
https://mail.gna.org/listinfo/pokersource-commits
