X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=Makefile.am;h=0137963f80414e1b533165f15c7287e7fb833e8e;hp=6cc2b4a052a9f3a61ca2f93a20b84ef821e8fd6e;hb=2a6a46caf4f1d149a8e72cb0fb0c90f9923a27bb;hpb=687788b547e87d4c8f915e175d8896ae7ffdbd47

diff --git a/Makefile.am b/Makefile.am
index 6cc2b4a0..0137963f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,8 @@ Gitlive_SOURCES = \
           c/xorg_idletime.c \
           WindowLog.vala \
           Clones.vala \
-          NewBranch.vala 
+          NewBranch.vala \
+          MergeBranch.vala