| commit | d1ebbb4c06bdc9077791f784fe739c4b510f26ca | |
| author | James Liggett <jrliggett@cox.net> | |
| Tue, 9 Nov 2010 03:28:53 +0000 (8 19:28 -0800) | ||
| committer | James Liggett <jrliggett@cox.net> | |
| Tue, 9 Nov 2010 03:28:53 +0000 (8 19:28 -0800) | ||
| tree | 362b1efc90826063aac778d020135394a3748271 | treesnapshot (tar.gz zip) |
| parent | e4e2fb0a010ee2b642852c688a5c4a84ea45fd97 | commitdiff |
| parent | 26867619999efd8962571e90156af3a71bf8b482 | commitdiff |
Merge branch 'master' into git-shell
Conflicts:
plugins/git/anjuta-git.ui
plugins/git/git-diff-dialog.c
plugins/git/git-log-dialog.c
plugins/git/git-ui-utils.c
Conflicts:
plugins/git/anjuta-git.ui
plugins/git/git-diff-dialog.c
plugins/git/git-log-dialog.c
plugins/git/git-ui-utils.c
| libanjuta/Makefile.am | diff1 | diff2 | blobhistory |