Merge remote branch 'origin/dev' into dev

Conflicts:
ForgeGit/forgegit/git_main.py

Rick Copeland Rick Copeland 2010-10-14

<< < 1 .. 6 7 8 9 10 .. 172 > >> (Page 8 of 172)
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/ru/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sk
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sk/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sk/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sk/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sl
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sl/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sl/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sl/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sv
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sv/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sv/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/sv/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/th
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/th/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/th/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/th/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/tr
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/tr/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/tr/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/tr/commands.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/zh-tw
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/zh-tw/_font_choice.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/zh-tw/_link_dialog.js.i
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/ew/static/dojo/dijit/__editor/nls/zh-tw/commands.js.i
<< < 1 .. 6 7 8 9 10 .. 172 > >> (Page 8 of 172)