Merge branches 'icordrc' and 'filter'
authorMartin Engelmann <murphi.oss@googlemail.com>
Sat, 26 Feb 2011 16:54:11 +0000 (17:54 +0100)
committerMartin Engelmann <murphi.oss@googlemail.com>
Sat, 26 Feb 2011 16:54:11 +0000 (17:54 +0100)
commit5bfb0f67a66f409eaeeda69d66c722993e8a5e08
tree9598fbe35b4cfa83b195c3b0a7c105df144a463a
parent4be81efe8363ca6d8c03532f760306e49aba554e
parent0e1542c6cda28d8eb35bc1a8261587de0a908cc3
parentaefebd4ddf591e24cbf96c8bd49502d3ace38609
Merge branches 'icordrc' and 'filter'
src/icordrc/icordrc.cpp