Merge remote branch 'origin/dev' into dev

Conflicts:
ForgeGit/forgegit/git_main.py

Rick Copeland Rick Copeland 2010-10-14

<< < 1 .. 4 5 6 7 8 .. 172 > >> (Page 6 of 172)
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/fi/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/fi/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/fi/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/fr
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/fr/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/fr/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/fr/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/he
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/he/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/he/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/he/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/hu
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/hu/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/hu/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/hu/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/it
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/it/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/it/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/it/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ja
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ja/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ja/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ja/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ko
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ko/_font_choice.js.i
<< < 1 .. 4 5 6 7 8 .. 172 > >> (Page 6 of 172)