-
Carles Pina i Estany authored
Conflicts: glade/chronojump.glade (deleted here) howto_compile.txt (edited in both branches, conflict resolved)
834acf0f
Conflicts: glade/chronojump.glade (deleted here) howto_compile.txt (edited in both branches, conflict resolved)