Merge branch 'setup_colors' into setup_app_name
authormasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 10:24:29 +0000 (12:24 +0200)
committermasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 10:24:29 +0000 (12:24 +0200)
commitea7f8fe49152fee3d92f1762d0e6538fa081c9d8
tree98246cff7f2eb90bbdde7fb1b1faf4c753bec168
parentbf21e3f026f312a06da6f1a5b6163140386f3d9e
parent1809997dc165b8275c9ae4ff5fd480b434d7eff4
Merge branch 'setup_colors' into setup_app_name
res/values/setup.xml