[Bro-Dev] Merge

Gregor Maier gregor at icir.org
Sat Nov 27 10:16:39 PST 2010

On 11/24/10 21:50 , Robin Sommer wrote:
> On Wed, Nov 24, 2010 at 21:17 -0800, I wrote:
>> Note to all: this may make the masters unstable for a bit until I
>> get everything into the right shape.
> Ok, done; all cmake-ports are merged in. For a quick test, it seems
> work ok (except for the spamming ...). But I'll do some more testing
> later. I haven't deleted the topic branches yet.

bro master still contains the autoconf-related files (configure.in,
Makefile.am, autogen.sh, etc.). Those should probably also be deleted
once you are done.

Gregor Maier                                             gregor at icir.org
Int. Computer Science Institute (ICSI)          gregor at icsi.berkeley.edu
1947 Center St., Ste. 600                    http://www.icir.org/gregor/
Berkeley, CA 94704

More information about the bro-dev mailing list