Updated Spanish translation
Updated Hungarian translation
Updated Hungarian translation
Add conflict_map to git
For conflicts, use MERGED by default, don't change permissions if file is the same
Add is_temp return to 'get_path_for_conflict' for non-temporary files

Depending on the VC, we sometimes create new temporary files using
direct VC calls, and sometimes reuse existing files from the conflict.
This patch adds an boolean return to get_path_from_conflict to
indicate whether the returned file is temporary and should be cleaned
up, or whether we should leave it alone.
Fix release date of 1.7.1 in NEWS
Fix is_temp being passed to the actual diff emit
PEP8 cvs.py
Validate CVS using local info rather than roundtrip (closes bgo#663128)
Fix adding directories on CVS and SVN (closes bgo#501098)

Adding directories in CVS and SVN doesn't work because these need to be
added from the parent folder. This patch adds a hack to VcView to
adjust our behaviour specifically for CVS and SVN modules to allow
directories to be added separately, and from a custom parent path.

Based on testing, Subversion 1.7 appears to handle this case without
special treatment, so this fix is applied only to the old SVN module.

Based on a patch from Manual Siggen.
Correctly handle Save/Save As action sensitivity (closes bgo#456704)
Don't use select() on Windows (closes bgo#578985)

Patch from Vincent Legoll and Robert Wahler.
build: Only update the MIME cache when DESTDIR isn't set

This adds a check to run update-mime-database / update-desktop-database
only when DESTDIR isn't set.

We don't want to include the generated cache files in downstream
packages. These should be regenerated on the user's machine, not on the
build host.

https://bugzilla.gnome.org/show_bug.cgi?id=696903
Apply blank line ignoring for folder comparisons (closes bgo#695912)

Previously, we applied any active filters, but didn't include the
ignore-blank-lines preference. As a result, the hack of filtering and
then ignoring blank lines as a substitute for multi-line regexes didn't
work as expected.

This patch changes the folder comparison to filter blank lines after
filtering is done, if so configured.
Give our NotebookLabel a custom type
Fix untested typo from commit d85080
Try both which and where on Windows

Many people running Meld on Windows are doing so in Unix environments,
but not all tools are always around. This commit lets us fall back to
the 'where' builtin on Windows, which lets us work with e.g., the
default msysgit shell.
Fix Windows-style paths when passing refs to Git (close bgo#615661)

Git expects Unix-style paths, even on Windows. This commit fixes this
case for the new VC infrastructure; the old infrastructure still
breaks, but fixing it is more involved and not worth the time.
Re-add writeable permission before deleting temp files on Windows

Windows refuses to delete non-writeable ('write protected') files, so
we re-add removed write permissions before deleting when running on
Windows.