Merge remote branch 'origin/dev' into dev

Conflicts:
ForgeGit/forgegit/git_main.py

Rick Copeland Rick Copeland 2010-10-14

<< < 1 .. 3 4 5 6 7 .. 172 > >> (Page 5 of 172)
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ca
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ca/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ca/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ca/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/cs
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/cs/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/cs/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/cs/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/da
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/da/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/da/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/da/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/de
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/de/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/de/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/de/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/el
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/el/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/el/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/el/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/es
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/es/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/es/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/es/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/fi
<< < 1 .. 3 4 5 6 7 .. 172 > >> (Page 5 of 172)