Merge remote branch 'origin/dev' into dev

Conflicts:
ForgeGit/forgegit/git_main.py

Rick Copeland Rick Copeland 2010-10-14

<< < 1 2 3 4 5 .. 172 > >> (Page 3 of 172)
removed ForgeGit/forgegit/tests/data/testgit.git/objects/info/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/objects/pack
removed ForgeGit/forgegit/tests/data/testgit.git/objects/pack/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/objects/pack/pack-209fb0184ed5fed7fa9ac14ef79edc114479d4c2.idx
removed ForgeGit/forgegit/tests/data/testgit.git/objects/pack/pack-209fb0184ed5fed7fa9ac14ef79edc114479d4c2.pack
removed ForgeGit/forgegit/tests/data/testgit.git/objects/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/refs/heads/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/refs/tags
removed ForgeGit/forgegit/tests/data/testgit.git/refs/tags/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/refs/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/packed-refs
removed ForgeGit/forgegit/widgets
removed ForgeGit/forgegit/widgets/__init__.py
removed ForgeGit/forgegit/widgets/log.py
removed ForgeGit/forgegit/widgets/revisions.py
removed ForgeHg/forgehg/templates/hg/admin_extensions.html
removed ForgeHg/forgehg/templates/hg/commit.html
removed ForgeHg/forgehg/templates/hg/fork.html
removed ForgeHg/forgehg/templates/hg/log.html
removed ForgeHg/forgehg/templates/hg/tree.html
removed ForgeHg/forgehg/templates/hg_widgets
removed ForgeHg/forgehg/templates/hg_widgets/log.html
removed ForgeHg/forgehg/templates/hg_widgets/revision.html
removed ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/docs
ForgeGit/forgegit/widgets
File was removed.
<< < 1 2 3 4 5 .. 172 > >> (Page 3 of 172)