Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop merge of bugfix branch #24

Merged
merged 5 commits into from
Jul 30, 2013
Merged

Develop merge of bugfix branch #24

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a11272
Make the delete task not fail if the build dir does not exist.
ljo Jun 28, 2013
11daa18
Merge remote-tracking branch 'origin/no-fail-on-no-build-dir' into de…
ljo Jun 28, 2013
d56a390
Merge remote-tracking branch 'upstream/develop' into develop
ljo Jul 8, 2013
f2ec1e0
Make the elapsed time calculation somewhat more robust by not only co…
ljo Jul 16, 2013
0628b02
Make the new document xquery template valid so that you do not get th…
ljo Jul 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/develop' into develop
  • Loading branch information
@ljo
ljo committed Jul 8, 2013
commit d56a3900191c4c06e835df7736576180eca9aaf1

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.