Merge branch 'setup_colors' into setup_app_name
authormasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 10:42:57 +0000 (12:42 +0200)
committermasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 10:42:57 +0000 (12:42 +0200)
commitaabdaee86861832d15558f91f040479a1906beee
tree8da3611770cc58d0ce4150219c18a5545eadf733
parent6e0c53649089732e59e45563d29784a01a499a06
parentd4b4dad2a80187086461676576f02d264df12e89
Merge branch 'setup_colors' into setup_app_name