]> git.street.me.uk Git - andy/viking.git/commit
Merge remote branch 'rnorris/unitPref'
authorGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Sat, 13 Mar 2010 20:25:44 +0000 (21:25 +0100)
committerGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Sat, 13 Mar 2010 20:25:44 +0000 (21:25 +0100)
commit82331b4c4e7d40c51676211beda3c19560a1576b
treef917b26e5eb9f9f12d1d681d3f174f97cfa8cf58
parent6d0927b1b61b1f2f9ec5d048d85d8a4cad24f649
parent3bfdae599f7c30bc1b6831bd39f53776b90ac4db
Merge remote branch 'rnorris/unitPref'