(Re)Merge branch 'master' into cayuga

Browse Source

Corrected the merge direction this time, so that running
`git describe` on the master branch finds v0.9.7 as the most recent
tag.

Change-Id: I9e7b5d473c26e670c6d9a76f5c03fa617690651d

...

This commit is contained in:

John Koleszar 2011-08-04 17:05:55 -04:00

parent e28e08146e 9eb0b2f1da

commit 56417a3075

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available