Merge branch 'master' into entry
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Sat, 9 Aug 2008 07:59:01 +0000 (04:59 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Sat, 9 Aug 2008 07:59:01 +0000 (04:59 -0300)
commit98b34debbadc6b126a2c3bb817c0d72770e55e89
tree9f3d2210b9b300628e194f8ddb35795e6a3a9919
parentbc3cd0f1190c163bc10bfb5fdf36021eed939979
parent28f92055c4f63c94fea145871f1dab5bb56c0240
Merge branch 'master' into entry

Conflicts:

Makefile.am
atom/Makefile.am
atom/entry.c
configure.ac

Get atom entry implementation from libatom. Some changes needed in
headers and usage of it.
atom/Makefile.am
configure.ac