Viewing all changes in revision 362.
- Committer: MarkieB
- Date: 2010-04-18 17:37:35 UTC
- Revision ID: launchpad.org.markie1@dfgh.net-20100418173735-y8yrxkcqbxadrftx
suppress spurious 'conflict' in header includes arising from merger 352.1.2
- files modified:
- src/applet-main.c
expand all
collapse all
added
removed
