From: martin f. krafft <madduck@madduck.net>
Date: Sat, 5 Sep 2009 10:06:05 +0000 (+0200)
Subject: merge words
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/dce1f8994a417a091045fe27aa93dbe5e1cd6520

merge words
---

dce1f8994a417a091045fe27aa93dbe5e1cd6520
diff --cc .vim/spell/en.utf-8.add
index e604810,ce6fa95..56a3f85
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@@ -1,83 -1,89 +1,88 @@@
--pleonastic
--Tarde's
--pleonastic
++ADSL
++Ajzen
++Akkerman
++alioth
++alright
++anonymise
++anonymised
++anonymising
++autotools
  B
--S
++blog
++blogged
++bo
++Boehm
++BTS
++c0ffee
++changelog
  cosmopolite
--trialable
--learnable
--Homophily
--homophilous
--Trialability
  cosmopoliteness
++deadbeef
++debhelper
++debian
  Debian
--Slackware
++Debianisation
++debianised
  Debian's
 -hamm
 -debian
 -mdadm
 -svn
 -blogged
 -blog
 -madduck
 -vcs
 -upstream's
 -ADSL
++Delphis
++devel
+ diff
 -snapshotted
 -debianised
 -Debianisation
 -changelog
 -screenshot
 -namespace
 -rebase
 -rebasing
 -alright
 -alioth
 -iff
 -rebases
 -workflow
 -lenny
 -deadbeef
 -c0ffee
 -tarballs
+ dpkg
 -BTS
 -freenode
 -IRC
 -rex
 -bo
 -Troup
 -Schulze
 -Wichert
 -Akkerman
 -RC
 -oldstable
 -tarball
 -Trialability
++EFTE
++Farquhar
+ Fishbein
 -Ajzen
 -workflows
 -homophily
 -Heterophily
++freenode
++Genericity
 +hamm
- debian
- mdadm
- svn
- blogged
- blog
+ heterophilous
+ heterophily
++Heterophily
++homophilous
++homophily
++Homophily
++iff
++IRC
++Jun
++learnable
++lenny
++Likert
++lintian
+ localite
 -Debian
 -EFTE
 -anonymised
 -Delphis
 -Farquhar
 -Boehm
 -s
 -vi
 -devel
 -pkg
 -panelists
 -anonymise
 +madduck
- vcs
- upstream's
- ADSL
- diff
- snapshotted
- debianised
- Debianisation
- changelog
- screenshot
++mdadm
 +namespace
++oldstable
+ panelist
 -anonymising
 -Peercolation
 -debhelper
 -autotools
 -Genericity
 -lintian
 -Likert
++panelists
+ peercolation
 -trialability
++Peercolation
+ phd
++pkg
++pleonastic
++RC
 +rebase
- rebasing
- alright
- alioth
- iff
 +rebases
- workflow
- lenny
- deadbeef
- c0ffee
- tarballs
- dpkg
- BTS
- freenode
- IRC
++rebasing
 +rex
- bo
- Troup
++s
++S
 +Schulze
- Wichert
- Akkerman
- RC
- oldstable
++screenshot
++Slackware
++snapshotted
++svn
 +tarball
++tarballs
++Tarde's
+ tesseract
++trialability
 +Trialability
- Fishbein
- Ajzen
- workflows
- homophily
- Heterophily
- heterophilous
- heterophily
- localite
- Debian
- EFTE
- anonymised
- Delphis
- Farquhar
- Boehm
- s
- vi
- devel
- pkg
- panelists
- anonymise
- panelist
- anonymising
- Jun
- Likert
++trialable
++Troup
 +Ubuntu
- peercolation
++upstream's
++vcs
++vi
++Wichert
++workflow
++workflows