5 commits

Author	SHA1	Message	Date
Robin Sommer	818f5f4c0a	aux/bro-aux was still pointing to the topic branch.	2010-11-26 12:07:50 -08:00
Robin Sommer	702e2ec0f1	Updating submodules.	2010-11-24 21:32:52 -08:00
Robin Sommer	610d081c4b	Merge with origin/topic/cmake-port. ... Needed to readd the broctl/broccoli/binpac submodules manually, as git seemed to get confused by the existing directories.	2010-11-24 21:02:08 -08:00
Robin Sommer	c1768336c4	Removing aux/{broctl,binpac,broccoli} in preparation for merge.	2010-11-24 20:33:34 -08:00
Robin Sommer	61757ac78b	Initial import of svn+ssh:://svn.icir.org/bro/trunk/bro as of r7088	2010-09-27 20:42:30 -07:00