Mercurial > hg > nodescore
changeset 35:5775286673c1
Merge branch 'master' of gitorious.org:nodescore/nodescore
Conflicts:
www/m/thumbs/1.png
www/m/thumbs/2.png
www/m/thumbs/3.png
www/m/thumbs/4.png
www/m/thumbs/5.png
www/m/thumbs/6.png
| author | tzara <rc-web@kiben.net> |
|---|---|
| date | Sun, 19 Aug 2012 22:23:11 +0000 |
| parents | c4719d1b7633 (current diff) 710ce76d98fd (diff) |
| children | 1d029c2132bd |
| files | www/m/thumbs/1.png www/m/thumbs/2.png www/m/thumbs/3.png www/m/thumbs/4.png www/m/thumbs/5.png www/m/thumbs/6.png |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/nodescore Sun Aug 19 21:44:23 2012 +0000 +++ b/nodescore Sun Aug 19 22:23:11 2012 +0000 @@ -9,7 +9,13 @@ # nodescore@kiben.net # nodescore.kiben.net +if [ "$1" = "home" ] +then +SERVER='192.168.1.77:8889' +else SERVER='http://nodescore.kiben.net:8889' +fi + BASEDIR='www/m' PROJECT='seta' THUMBPATH=$BASEDIR/thumbs