Merge branch 'stable'

Conflicts:
	scoreboard.js
This commit is contained in:
Neale Pickett 2011-11-22 14:02:04 -07:00
commit 30bc757216
2 changed files with 2 additions and 2 deletions

View File

@ -93,7 +93,7 @@
<a href="http://woozle.org/~neale/gitweb.cgi/scoreboard/stable.zip">Download <a href="http://woozle.org/~neale/gitweb.cgi/scoreboard/stable.zip">Download
the latest version</a> to your hard drive to run a scoreboard the latest version</a> to your hard drive to run a scoreboard
without Internet access (<strong>recommended</strong>). This without Internet access (<strong>recommended</strong>). This
includes the includes the documentation.
</p> </p>
<p> <p>

View File

@ -1,7 +1,7 @@
/* /*
* LADD Roller Derby Scoreboard * LADD Roller Derby Scoreboard
* Copyright © 2011 Neale Pickett <neale@woozle.org> * Copyright © 2011 Neale Pickett <neale@woozle.org>
* Time-stamp: <2011-11-22 00:20:00 neale> * Time-stamp: <2011-11-22 14:01:38 neale>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by