diff --git "a/merges.txt" "b/merges.txt" new file mode 100644--- /dev/null +++ "b/merges.txt" @@ -0,0 +1,182678 @@ +******** **************************************************************** +**************************************************************** ******** +******************************** ******************************** +-------------------------------- -------------------------------- +################ ################ +**************** **************** +---------------- ---------------- +//////////////// //////////////// +================ ================ +######## ######## +******** ******** +--- ------------- +---- ------------ +-------- -------- +------------ ---- +------------- --- +........ ........ +.spring framework +//////// //////// +======== ======== +@ implementation +. Configuration +.Config uration +.Serial ization +Admin istration +Class ification +Ident ification +Implement ation +Trans formation +Transform ation +class ification +communication s +constitution al +imple mentation +implement ation +re presentation +represent ation +- ------------ +---- --------- +----- -------- +-------- ----- +--------- ---- +------------ - +-in flammatory +. Serializable +.Serial izable +Altern atively +Alternative ly +Author ization +Config uration +Document ation +Environment al +Interest ingly +Interesting ly +Inter national +Intern ational +Not ifications +Notification s +Spec ification +Specific ation +Transaction al +Under standing +Un fortunately +authenticate d +author ization +config uration +docu mentation +document ation +inter national +intern ational +not ifications +notification s +organ izations +organization s +qual ification +relation ships +relations hips +relationship s +sub scriptions +subs criptions +subscription s +--- --------- +---- -------- +-------- ---- +--------- --- +-d imensional +-in dependent +- performance +-per formance +. Application +. Collections +. Controllers +.Control lers +.D iagnostics +. IOException +.IO Exception +. annotations +.annotation s +. application +. description +.d escription +.de scription +.des cription +.p ersistence +Additional ly +Application s +Arch itecture +Av ailability +Construct ion +Experiment al +Install ation +Instruction s +Inter mediate +Int roduction +Intro duction +Manufact urer +Not ification +Organ ization +Phil adelphia +Present ation +Prof essional +Reg istration +Relation ship +Relations hip +Requirement s +Serial izable +Trans actions +Transaction s +Trans mission +Ver ification +_ description +_d escription +_de scription +announce ment +application s +arch itecture +av ailability +avail ability +confirm ation +con stitution +construct ion +depend encies +experiment al +install ation +instruction s +inter section +manufact urer +mill iseconds +milli seconds +not ification +ograph ically +ographic ally +ographical ly +organ isation +organ ization +participant s +present ation +prof essional +profession al +reg istration +relation ship +relations hip +re positories +require ments +static method +sub scription +subs cription +trans actions +transaction s +translation s +ver ification +with standing +- associated +- components +-com ponents +-component s +-cont aining +- controlled +-cont rolled +-control led +- expression +-ex pression +- functional +-function al +- generation +-g eneration +- government +- management +-man agement +- processing +-process ing +- production +-p roduction +-pro duction +-product ion +- resolution +-re solution +-res olution +- responsive +- validation +. Connection +. Extensions +. Interfaces +.Inter faces +. Parameters +. Repository +.Re pository +. annotation +.con current +. controller +.google apis +. properties +. repository +.re pository +. validation +/ components +/com ponents +/ javascript +/j avascript +/java script +@end section +Alter native +Altern ative +An notations +Annotation s +Appl ication +App ointment +Assoc iation +Associ ation +Cert ificate +Christ opher +Col lections +Coll ections +Colle ctions +Collect ions +Collection s +Com position +Comp osition +Conn ections +Connect ions +Connection s +Consider ing +Constraint s +Con structor +Construct or +Cont rollers +Control lers +Controller s +Co ordinates +Coordinate s +Coord inator +Cred entials +Definition s +D escription +De scription +Des cription +D estination +Dest ination +Develop ment +Engine ering +En vironment +Further more +IO Exception +Im mediately +Implement ed +In dependent +In formation +Inform ation +Inte raction +Inter action +Inter active +Inter ceptor +Interest ing +Measure ment +Per formance +Perform ance +Per missions +Perm issions +Permission s +P references +Pre ferences +Preference s +Program ming +Prop agation +Publ ication +Publi cation +Public ation +Rec ognition +Recogn ition +Research ers +Res ervation +Trans action +Trans former +Transform er +Trans lation +alter native +altern ative +an notations +annot ations +annotation s +app ointment +appoint ment +attach ments +attachment s +cert ificate +col lections +coll ections +colle ctions +collect ions +collection s +com petition +compet ition +compet itive +com position +comp osition +com pression +compr ession +compress ion +condition al +conn ections +conne ctions +connect ions +connection s +constraint s +construct ed +con structor +construct or +contin ental +continent al +cont rollers +control lers +controller s +co ordinates +coordinate s +cred entials +credential s +defin itions +definition s +d escription +de scription +des cription +desig nation +design ation +d estination +dest ination +develop ment +direct ories +director ies +electron ics +engine ering +en vironment +fortunate ly +implement ed +inform atics +in formation +inform ation +ingredient s +initial ized +initialize d +in stitution +instr uction +integr ation +inte raction +inter action +inter active +interest ing +iss enschaft +lim itations +limit ations +measure ment +orient ation +o technology +otechn ology +per formance +perform ance +per missions +perm issions +permission s +place holder +p references +pre ferences +prefer ences +publ ication +publi cation +public ation +re commended +recommend ed +re interpret +re placement +replace ment +represent ed +res ervation +restaurant s +restrict ion +term ination +termi nation +termin ation +trans action +trans lation +trans parent +user content +( Exception +-American s +- character +- component +-com ponent +- condition +- connected +- container +-cont ainer +- dependent +-des cribed +- direction +-d irection +-di rection +-direct ion +- effective +-effect ive +-fashion ed +- frequency +-f requency +- generated +-g enerated +-int ensive +- operation +-oper ation +- operative +-oper ative +-p resident +-pres ident +- reference +-re ference +-res istant +- secondary +-second ary +-section al +-s ensitive +- supported +-s upported +-support ed +- transform +-trans form +. Autowired +. Component +.Com ponent +.Th reading +.Thread ing +. component +.com ponent +. configure +.con figure +.conf igure +.config ure +. container +. exception +.ex ception +.f asterxml +.m icrosoft +.m inecraft +. prototype +.string ify +. substring +.substr ing +. transform +.trans form +.w ikipedia +/ questions +/ resources +/re sources +/res ources +@ Component +@ interface +Act ivation +Activ ation +Act ivities +Activ ities +An notation +Ann otation +Ass ignment +Assign ment +Associ ated +Associate d +Att achment +Att endance +Attribute s +Austr alian +Australia n +Autom ation +BACK GROUND +Back ground +Calc ulator +Calcul ator +Cal ifornia +Calif ornia +C andidates +Candidate s +C ategories +Categ ories +Char acters +Character s +Class ifier +Col lection +Coll ection +Colle ction +Collect ion +Com mercial +Com mission +Comm ission +Commi ssion +Compa rator +Compar ator +Compa rison +Compar ison +Com pletion +Comp letion +Comple tion +Com ponents +Component s +Con clusion +Cond itions +Condition s +Con ference +Confe rence +Conn ection +Connect ion +Contin uous +Cont roller +Contr oller +Control ler +Con vention +Conv ention +Con version +Conv ersion +Co ordinate +Coord inate +Cor rection +Correct ion +Dec oration +Decor ation +Def inition +Dep artment +Depar tment +Depart ment +De ployment +Des criptor +D ictionary +Dicti onary +D ifference +Dim ensions +Dimension s +Disc ussion +Dispatch er +Elect ronic +Enter prise +E valuation +Event ually +Every thing +Ex ceptions +Exce ptions +Except ions +Exception s +Exper ience +Exper iment +Ex pression +Expr ession +Expre ssion +Express ion +Ext ensions +Extension s +Found ation +Function al +G eneration +Gene ration +Gener ation +Gover nment +Govern ment +Ident ifier +Im possible +In creasing +Ind ividual +Initial ize +In strument +Inter faces +Interface s +J avascript +Java script +Man agement +Manag ement +Manage ment +Man chester +Member ship +Members hip +Middle ware +Monitor ing +N avigation +Nav igation +Observ able +Oper ations +Opera tions +Operation s +Origi nally +Origin ally +Original ly +Param eters +Parameter s +Per centage +Percent age +Per mission +Perm ission +Pers istent +Pop ulation +Pred iction +Predict ion +P reference +Pre ference +Pre viously +Prev iously +Previous ly +Proce ssing +Process ing +P roduction +Pro duction +Prod uction +Produ ction +Product ion +Prot ection +Prote ction +Protect ion +Re ferences +Refer ences +Reference s +Ref lection +Reflect ion +Reg ardless +Register ed +Re gression +Re pository +Res istance +Re solution +Res olution +Serial izer +Serialize r +S imulation +Sim ulation +Stat istics +Stati stics +Success ful +Techn ology +Through out +Trans ition +Trans lator +Typ ography +Un expected +Un iversity +Unive rsity +Univers ity +Valid ation +Vis ibility +Washi ngton +_ attribute +_at tribute +_ container +_ directory +_d irectory +_ transform +_trans form +accep table +accept able +acces sible +access ible +act ivation +acti vation +activ ation +act ivities +activ ities +ail ability +al location +all ocation +allo cation +alloc ation +anim ations +anima tions +animation s +an notation +ann otation +annot ation +appea rance +appear ance +ass essment +ass ignment +assign ment +associate d +att achment +attac hment +attach ment +att endance +atten dance +attribute s +autho rized +author ized +authorize d +autom ation +calc ulator +calcul ator +capital ize +c ategories +cent ration +centr ation +char acters +character s +check point +class ified +class ifier +col lection +coll ection +colle ction +collect ion +com mercial +com mission +comm ission +commi ssion +compa rison +compat ible +com pletion +comp letion +com ponents +component s +com pressed +compr essed +compress ed +cond itions +condi tions +condition s +con ference +conf idence +confi dence +config ured +configure d +conne cting +connect ing +conn ection +conne ction +connect ion +cons istent +contain ers +container s +contin uous +cont rolled +contro lled +control led +cont roller +contr oller +contro ller +control ler +con version +conv ersion +conve rsion +co ordinate +coord inate +cred ential +def inition +defin ition +dep artment +depar tment +depart ment +depend ency +de ployment +deploy ment +dep recated +desc ending +des criptor +develop ers +developer s +d ictionary +dicti onary +d ifference +dif ference +diffe rence +dim ensions +dimen sions +dimension s +dis connect +disc ussion +em ployment +end foreach +ens itivity +enter prise +ers istence +e scription +es cription +escri ption +es pecially +espec ially +est ination +esti nation +estin ation +e valuation +eval uation +every thing +ex ceptions +except ions +exception s +ex pression +expr ession +express ion +ext ensions +extension s +flamm atory +fore ground +found ation +funct ional +function al +g eneration +gene ration +gener ation +gover nment +ident ified +ident ifier +ific ations +ifica tions +ification s +imens ional +imension al +im plements +imp lements +impl ements +imple ments +implement s +implicit ly +increment s +ind ividual +inherit doc +initial ize +inspect ion +in strument +instr ument +inter faces +interface s +int estinal +invest ment +irect ional +irection al +iter ations +itera tions +iteration s +j avascript +java script +man agement +mana gement +manag ement +manage ment +membe rship +member ship +members hip +middle ware +n avigation +nav igation +news letter +normal ized +normalize d +observ able +occup ation +ograp hical +ograph ical +ographic al +olog ically +ologi cally +ologic ally +ological ly +oper ations +opera tions +operation s +ord ination +ordi nation +ordin ation +param eters +parameter s +per centage +percent age +per mission +perm ission +permi ssion +pers istent +persist ent +pop ulation +popu lation +popul ation +posit ories +pred iction +predi ction +predict ion +proce ssing +process ing +process ors +processor s +p roduction +pro duction +prod uction +produ ction +product ion +prod uctive +produ ctive +product ive +prof ession +profe ssion +pro jection +proj ection +proje ction +project ion +proper ties +reason able +recogn ized +re ferences +refer ences +reference s +ref lection +reflect ion +regis tered +register ed +re pository +repos itory +re solution +res olution +resol ution +respons ive +resta urant +restrict ed +right arrow +s criptions +scri ptions +scrip tions +script ions +scription s +serial izer +serialize r +s imulation +sim ulation +simu lation +simul ation +stat istics +stati stics +struct ured +structure d +struc tures +struct ures +structure s +style sheet +styles heet +sub mission +sub scriber +subscribe r +success ful +techn ology +term inated +termi nated +termin ated +terminate d +trans ition +trans lated +translate d +trans lator +under score +unders core +un expected +un finished +valid ation +vis ibility +ynchron ous +( document +(d ocument +( expected +(ex pected +( filename +(f ilename +(file name +( function +(f unction +(func tion +( password +(p assword +( position +(p osition +(pos ition +( response +(res ponse +( unsigned +(un signed +( username +(user name +- -------- +---- ----- +----- ---- +-------- - +- American +- European +- analysis +-build ing +-c entered +-cent ered +-center ed +- commerce +-com merce +-c ultural +-de signed +-des igned +-design ed +-d irected +-direct ed +- distance +-d istance +-di stance +-dis tance +-dist ance +- economic +-e conomic +-e lection +-el ection +-elect ion +-ex istent +- existing +-ex isting +- friendly +-f riendly +- function +-f unction +- gradient +- interest +-inter est +- language +-l anguage +- learning +-l earning +-le arning +- material +-m aterial +-media ted +- negative +- platform +-pl atform +- position +-p osition +- positive +- pressure +-pres sure +-pro duced +- products +-product s +-read able +- response +-res ponse +- security +-s ecurity +- services +-s ervices +-service s +-spe aking +- specific +-s pecific +- standard +- standing +-st anding +- template +-t emplate +- terminal +-term inal +- transfer +-trans fer +. Abstract +. Contains +.Con tains +. Controls +.Control s +. Entities +. Identity +.Id entity +. Instance +.In stance +. Location +.L ocation +. Property +. Register +.Reg ister +. Resource +.Re source +. Response +. Security +.S ecurity +. Services +.S ervices +.Service s +. activity +.blog spot +. category +.c ategory +. children +.child ren +. contains +.con tains +. datetime +.dat etime +.date time +. facebook +. generate +.g enerate +. includes +.in cludes +. instance +.in stance +. internal +.in ternal +.int ernal +.inter nal +. location +.l ocation +.loc ation +. password +.p assword +. position +.p osition +.pos ition +. property +. question +.read line +. register +. response +.res ponse +. security +.s ecurity +. selected +.se lected +.select ed +. services +.s ervices +.service s +. username +.user name +. validate +/ articles +/article s +/ document +/d ocument +/doc ument +/ download +/d ownload +/ internal +/in ternal +/int ernal +/ material +/m aterial +/ platform +/pro blems +/ products +/product s +/ provider +/pro vider +/ services +/s ervices +/service s +< iostream +