Browse Source

Merge branch 'master' of ssh://lohrun.net/~crep/songbook

Conflicts:
	songs/Daniel_Lanois/Jolie_Louise.sg
	songs/Maxime_Le_Forestier/Je_ne_sais_rien_faire.sg
	songs/Oldelaf_et_Monsieur_D/Super_heros.sg
	songs/Pigalle/Dans_la_salle_du_bar_tabac_de_la_rue_des_martyrs.sg
remotes/origin/cmake
Romain Goffe 13 years ago
parent
commit
71f7833c33
  1. 2
      songs/Oldelaf_et_Monsieur_D/Super_heros.sg
  2. 2
      songs/Pigalle/Dans_la_salle_du_bar_tabac_de_la_rue_des_martyrs.sg

2
songs/Oldelaf_et_Monsieur_D/Super_heros.sg

@ -91,4 +91,4 @@
Super héros au grand \[Am]cœur
\endchorus
\endsong
\endsong

2
songs/Pigalle/Dans_la_salle_du_bar_tabac_de_la_rue_des_martyrs.sg

@ -79,4 +79,4 @@
Dans la salle du bar-tabac de la rue des martyrs (Ad Lib.)
\endverse
\endsong
\endsong

Loading…
Cancel
Save