[Bro-Dev] Merge

[Adam Slagell]

Laying in bed with son. 
3 year old listening to dualing ipad & iPhone emails: what's that daddy?
Me: sounds like a git merge
Son:  no. That's silly. 

On Nov 24, 2010, at 11:50 PM, Robin Sommer <robin at icir.org> 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.
> 
> Robin
> 
> -- 
> Robin Sommer * Phone +1 (510) 722-6541 * robin at icir.org
> ICSI/LBNL    * Fax   +1 (510) 666-2956 *   www.icir.org
> _______________________________________________
> bro-dev mailing list
> bro-dev at bro-ids.org
> http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev
>