Commit3297fe5

committed

Merge remote-tracking branch 'upstream/master'

2 parents722473e +76e19e4 commit3297fe5Copy full SHA for 3297fe5

File tree

-3

lines changed

-3

lines changed

Lines changed: 0 additions & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ Changelog`
`7`	`7`
`8`	`8`	* `Commit.diff()` now supports diffing the root commit via `Commit.diff(NULL_TREE)`.
`9`	`9`	* `Repo.blame()` now respects `incremental=True`, supporting incremental blames. Incremental blames are slightly faster since they don't include the file's contents in them.
`10`		`-`
	`10`	`+* IMPORTANT: This release drops support for python 2.6, which is officially deprecated by the python maintainers.`
`11`	`11`
`12`	`12`	`1.0.2 - Fixes`
`13`	`13`	`=============`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,6 @@ def _stamp_version(filename):`
`110`	`110`	`"Operating System :: MacOS :: MacOS X",`
`111`	`111`	`"Programming Language :: Python",`
`112`	`112`	`"Programming Language :: Python :: 2",`
`113`		`-"Programming Language :: Python :: 2.6",`
`114`	`113`	`"Programming Language :: Python :: 2.7",`
`115`	`114`	`"Programming Language :: Python :: 3",`
`116`	`115`	`"Programming Language :: Python :: 3.3",`

Comments

(0)