Merge branch 'doxygen-style'
authorJustin Seyster <jseyster@cs.sunysb.edu>
Wed, 20 Oct 2010 21:42:34 +0000 (17:42 -0400)
committerJustin Seyster <jseyster@cs.sunysb.edu>
Wed, 20 Oct 2010 21:42:34 +0000 (17:42 -0400)
commit4c67ef0fbf11c7abe9d2bc8b1f0c8bc17c89f6ed
tree2fa7fa102f225dbd00dc423fb34eac0506d74656
parent62d0d1937aa951bc716ad41126c3978894b405b0
parent6882947d7bfbd3a27269f73d35b21bea61970bcc
Merge branch 'doxygen-style'

Conflicts:
src/aop-pointcut.c
src/aop.h
src/aop-doxy-main.c
src/aop-header.c
src/aop-main.c
src/aop-pc-assign.c
src/aop-pc-entry.c
src/aop-pc-exit.c
src/aop-pointcut.c
src/aop-weave.c
src/aop.h