| commit | eb6602cbfdff8307ee1694e78f619cbce02b6474 | [log] [tgz] |
|---|---|---|
| author | Dave Orme <djo@coconut-palm-software.com> | Mon Jun 06 10:34:12 2011 -0500 |
| committer | Dave Orme <djo@coconut-palm-software.com> | Mon Jun 06 10:34:12 2011 -0500 |
| tree | fb65f791445bc8576b664e1b6edecf9b2133e1bf | |
| parent | 3791e1537a5eddd1c6e0e00cdbda426d64582f84 [diff] | |
| parent | 3946436872698531e1ebdb83642349837248e9b6 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/e4/org.eclipse.e4.utils Conflicts: .gitignore
diff --git a/.gitignore b/.gitignore index 368d5a3..e90d179 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,2 +1,5 @@ -bin .metadata +bin/ +*~ +*.rej +*.bak