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)
commitfc5608de767a9c45073b870e2e2860a012800f99
tree9c1fbca07dba27ca6f75335fa2140e7aea72d691
parentb66e309dfa8b145a293cb47b7cbcf588dc0c79ab
parenta1f8d76188259bb8ee7f3ff0c38b57401b379702
Merge branch 'setup_colors' into setup_app_name
res/values/setup.xml