projects / debian / openrocket / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bf5b73 370593c)
Merge commit '370593c3bd81b3bb9e8c29ae7f6e351b7a7e0263' into upstream upstream/1.1.7
authorBdale Garbee <bdale@gag.com>
Sat, 13 Aug 2011 18:30:21 +0000 (12:30 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 13 Aug 2011 18:30:21 +0000 (12:30 -0600)
Conflicts:
web/html/actions/updates.php
web/html/download.html
web/html/features.html
web/html/index.html
web/html/techdoc.pdf
web/htp/features.htp
web/htp/htp.def
web/htp/index.htp
web/htp/news.htp


Trivial merge
Debian packaging of openrocket