elliptical definitely. the rowing machine works fewer muscles and i think you'll find it gets boring pretty quick.
Even if the number of muscles worked was at issue (which it really isn't; the main benefit of each is an all-around aerobic workout,) the rower engages nearly every muscle in the body.
If you want to work muscles, use resistance. If you want to do cardio, any will be fine.
