# HG changeset patch # User Alpar Juttner # Date 1241016728 -3600 # Node ID 0286cb1ac78dcf5ded1701c171eb52c03d5f19ea # Parent d21b38647e53fee3c3e4efa31f4538c7732d3ba8# Parent 936355864d6e4eed6e0a93289c604801ccb255f9 Merge diff -r d21b38647e53 -r 0286cb1ac78d lemon/Makefile.am --- a/lemon/Makefile.am Tue Apr 28 16:44:48 2009 +0100 +++ b/lemon/Makefile.am Wed Apr 29 15:52:08 2009 +0100 @@ -57,6 +57,7 @@ lemon/assert.h \ lemon/bfs.h \ lemon/bin_heap.h \ + lemon/cbc.h \ lemon/circulation.h \ lemon/clp.h \ lemon/color.h \