Merge branch 'setup_colors' into setup_app_name
authormasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 13:00:16 +0000 (15:00 +0200)
committermasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 13:00:16 +0000 (15:00 +0200)
1  2 
res/values/setup.xml

Simple merge