Mercurial > hg > nodescore
diff www/m/controls.html @ 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 | ea19684cd1db |
children |