Pull current colours etc from CDSREFACTOR branch.
commit98d0a90a6c375163f76fca5fead395914b1673b5
authorAndrew McMillan <andrew@morphoss.com>
Sun, 18 Dec 2011 23:50:47 +0000 (19 12:50 +1300)
committerAndrew McMillan <andrew@morphoss.com>
Mon, 2 Jan 2012 21:38:31 +0000 (3 10:38 +1300)
treef3d4294291235b17b1e97cb113efa4f618420b9a
parent9f7ec22841db783a4b548a99933b9edd7fcd1aba
Pull current colours etc from CDSREFACTOR branch.

Conflicts:

res/values/unlocalisable_strings.xml
res/values/unlocalisable_strings.xml