patching expected results after option help was changed in [14523] refs #21

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14537 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
fixing activitygen now that RONet has intenal edges in its dict

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14538 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
patching expected after attr names and velocity units were changed in [14523] refs #21

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14539 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
now using the already-existing attr 'laneChangeModel' instead of 'lcm' refs #1005

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14540 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
patching tests; obviously not run

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14541 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
patching tests; obviously not run

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14542 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
introducing distinction between "brutto" and "netto" occupancy, refs#932

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14543 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
patching tests, was: iintroducing distinction between "brutto" and "netto" occupancy, refs#932

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14544 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
taking vehicles that are only partially at a lane into account, refs#932

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14545 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
verbose

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@14546 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
Merge branch 'master' into planet