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)
1  2 
res/values/setup.xml

Simple merge