resolved merging issuemaster
commit8e2c483d7a2d4a3998aa12f7d458658fac41bc93
authorHanspeter Portner <hp@melifaro.echo>
Mon, 5 Jan 2009 16:59:18 +0000 (5 17:59 +0100)
committerHanspeter Portner <hp@melifaro.echo>
Mon, 5 Jan 2009 16:59:18 +0000 (5 17:59 +0100)
treeb04df3001f1715bc020a7e83131369d69373197e
parentfb8070482ad08215037d74bdcd7bc1cc36ac9d88
parent074beb51a9cc90637601c3990c1aef8b8e3016dc
resolved merging issue
src/modules/Makefile.am
src/modules/rank_gradual.c