Commit 1511ab278466431332d4efd82049343fe169505b
- Date: Mon May 12 16:41:15 +0000 2008
- Committer: Tim Harper (timcharper@gmail.com)
- Author: Tim Harper (timcharper@gmail.com)
- Commit SHA1: 1511ab278466431332d4efd82049343fe169505b
- Tree SHA1: 663dd5cbaf2ca603c214ad279a3bd605ce852dc5
Merge branch 'master' into release
Commit diff
| | |
| 1 | Release 1.5.3 [2008-04-30] |
| 2 | - Bugfix - merge was not restoring submodules if an empty directory was in the way. |
| 3 | |
| 1 | 4 | Release 1.5.2 [2008-04-30] |
| 2 | 5 | - Put a limit on the amount of lines diff will render, to keep it from freezing textmate for a painstaking amount of time. |
| 3 | 6 | |
| toggle raw diff |
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Release 1.5.3 [2008-04-30]
+ - Bugfix - merge was not restoring submodules if an empty directory was in the way.
+
Release 1.5.2 [2008-04-30]
- Put a limit on the amount of lines diff will render, to keep it from freezing textmate for a painstaking amount of time.
|
| | |
| 1 | 1 | The Git Textmate Bundle. |
| 2 | | Version 1.5.2 (released Apr 30, 2008) |
| 2 | Version 1.5.3 (released Apr 30, 2008) |
| 3 | 3 | |
| 4 | 4 | |
| 5 | 5 | <h2>Installation</h2> |
| toggle raw diff |
--- a/README.textile
+++ b/README.textile
@@ -1,5 +1,5 @@
The Git Textmate Bundle.
-Version 1.5.2 (released Apr 30, 2008)
+Version 1.5.3 (released Apr 30, 2008)
<h2>Installation</h2> |
