Merge remote branch 'origin/dev' into dev

Conflicts:
ForgeGit/forgegit/git_main.py

Rick Copeland Rick Copeland 2010-10-14

<< < 1 .. 5 6 7 8 9 .. 172 > >> (Page 7 of 172)
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ko/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ko/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/nb
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/nb/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/nb/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/nb/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/nl
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/nl/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/nl/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/nl/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pl
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pl/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pl/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pl/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pt-pt
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pt-pt/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pt-pt/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pt-pt/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pt
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pt/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pt/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/pt/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ru
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ru/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ru/_link_dialog.js.i
<< < 1 .. 5 6 7 8 9 .. 172 > >> (Page 7 of 172)