Menu

Commit [r7146]  Maximize  Restore  History

Merged revisions [7057-7059,7063,7128-7136,7142,7144/branches/0.11-stable] via svnmerge

I had to fix the svnmerge-integrated property by hand, after svnmerge created a conflicting change probably due to the presence of /trunk:... in the property (removed that part).

cboos 2008-05-26

changed /trunk
changed /trunk/trac/env.py
changed /trunk/trac/htdocs/css/browser.css
changed /trunk/trac/htdocs/js/expand_dir.js
changed /trunk/trac/mimeview/pygments.py
changed /trunk/trac/mimeview/tests/pygments.html
changed /trunk/trac/mimeview/tests/pygments.py
changed /trunk/trac/templates/macros.html
changed /trunk/trac/ticket/query.py
changed /trunk/trac/ticket/report.py
changed /trunk/trac/ticket/templates/query_results.html
changed /trunk/trac/ticket/web_ui.py
changed /trunk/trac/util/__init__.py
changed /trunk/trac/util/compat.py
changed /trunk/trac/wiki/api.py
/trunk
Directory.
/trunk/trac/env.py Diff Switch to side-by-side view
Loading...
/trunk/trac/htdocs/css/browser.css Diff Switch to side-by-side view
Loading...
/trunk/trac/htdocs/js/expand_dir.js Diff Switch to side-by-side view
Loading...
/trunk/trac/mimeview/pygments.py Diff Switch to side-by-side view
Loading...
/trunk/trac/mimeview/tests/pygments.html Diff Switch to side-by-side view
Loading...
/trunk/trac/mimeview/tests/pygments.py Diff Switch to side-by-side view
Loading...
/trunk/trac/templates/macros.html Diff Switch to side-by-side view
Loading...
/trunk/trac/ticket/query.py Diff Switch to side-by-side view
Loading...
/trunk/trac/ticket/report.py Diff Switch to side-by-side view
Loading...
/trunk/trac/ticket/templates/query_results.html Diff Switch to side-by-side view
Loading...
/trunk/trac/ticket/web_ui.py Diff Switch to side-by-side view
Loading...
/trunk/trac/util/__init__.py Diff Switch to side-by-side view
Loading...
/trunk/trac/util/compat.py Diff Switch to side-by-side view
Loading...
/trunk/trac/wiki/api.py Diff Switch to side-by-side view
Loading...