Merge remote branch 'origin/dev' into dev

Conflicts:
ForgeGit/forgegit/git_main.py

Rick Copeland Rick Copeland 2010-10-14

<< < 1 2 3 4 .. 172 > >> (Page 2 of 172)
added ForgeGit/forgegit/tests/data/testgit.git/refs/heads/master
added ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/a/b/c/hello.txt.i
added ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/_r_e_a_d_m_e.i
added ForgeHg/forgehg/tests/data/testrepo.hg/README
added ForgeSVN/forgesvn/tests/data/testsvn/db/revprops/0/4
added ForgeSVN/forgesvn/tests/data/testsvn/db/revs/0/4
added scripts/refresh-all-repos.py
removed Allura/allura/lib/widgets/file_browser.py
removed Allura/allura/templates/widgets/tree_widget.html
removed ForgeGit/forgegit/reactors
removed ForgeGit/forgegit/reactors/__init__.py
removed ForgeGit/forgegit/reactors/reactors.py
removed ForgeGit/forgegit/templates/git/admin_extensions.html
removed ForgeGit/forgegit/templates/git/commit.html
removed ForgeGit/forgegit/templates/git/fork.html
removed ForgeGit/forgegit/templates/git/log.html
removed ForgeGit/forgegit/templates/git_widgets
removed ForgeGit/forgegit/templates/git_widgets/log.html
removed ForgeGit/forgegit/templates/git_widgets/revision.html
removed ForgeGit/forgegit/templates/__init__.py
removed ForgeGit/forgegit/tests/data/testgit.git/branches
removed ForgeGit/forgegit/tests/data/testgit.git/branches/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/hooks/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/info/.gitignore
removed ForgeGit/forgegit/tests/data/testgit.git/objects/info
ForgeGit/forgegit/tests/data/testgit.git/refs/heads/master Diff Switch to side-by-side view
Loading...
ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/a/b/c/hello.txt.i Diff Switch to side-by-side view
Loading...
ForgeHg/forgehg/tests/data/testrepo.hg/.hg/store/data/_r_e_a_d_m_e.i Diff Switch to side-by-side view
Loading...
ForgeHg/forgehg/tests/data/testrepo.hg/README Diff Switch to side-by-side view
Loading...
ForgeSVN/forgesvn/tests/data/testsvn/db/revprops/0/4 Diff Switch to side-by-side view
Loading...
ForgeSVN/forgesvn/tests/data/testsvn/db/revs/0/4 Diff Switch to side-by-side view
Loading...
scripts/refresh-all-repos.py Diff Switch to side-by-side view
Loading...
ForgeGit/forgegit/reactors
File was removed.
<< < 1 2 3 4 .. 172 > >> (Page 2 of 172)