projects / debian / openrocket / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a075c4 9c8c5e8)
Merge commit '9c8c5e8c89c11db026c54d46f02c7b63d4e63d0a' into upstream upstream/1.1.9
authorBdale Garbee <bdale@gag.com>
Fri, 25 Nov 2011 03:55:21 +0000 (20:55 -0700)
committerBdale Garbee <bdale@gag.com>
Fri, 25 Nov 2011 03:55:21 +0000 (20:55 -0700)
Conflicts:
web/html/actions/updates.php
web/html/documentation.html
web/html/download.html
web/html/index.html
web/html/layout.css
web/htp/documentation.htp
web/htp/htp.def
web/htp/index.htp
web/htp/news.htp


Trivial merge
Debian packaging of openrocket