= Merge Tracking =

This page is used to track trunk change sets since the creation of the alpha 2 branch (r36345). Any developer (other than the committer) can review a change set. This page is automatically updated with the newest trunk commits every 15 minutes. '''Do not change the order, or layout of this page, only add or change data in the existing fields.'''

Legend:
 * '''Bold''' revisions still need to be reviewed
 * ''Italic'' revisions have been reviewed and should by merged by the release coordinator
 * ~~Stricken~~ revisions have been rejected for the branch
 * Normal revisions are approved and merged.

Guidelines:
 * Any developer (other than the committer) can review a change set.
 * If you have reviewed a change set and it is okay, please edit the page and add your nickname and a comment with at least 'ok' in it.
 * If you have reviewed a change set and it is not fit for the branch, please put a dash (-) under the ''Merged in'' column.
 * You do not have to change the layout according to the legend above: the script will take care of that in the next run!

||'''Revision'''||'''Component'''||'''Committer'''||'''Reviewer'''||'''Comment'''||'''Merged in'''||
||'''r36502'''||'''resedit'''||'''darkwyrm'''|| || || ||
||'''r36501'''||'''sgi'''||'''stippi'''|| || || ||
||'''r36500'''||'''app'''||'''stippi'''|| || || ||
||'''r36499'''||'''resedit'''||'''darkwyrm'''|| || || ||
||'''r36498'''||'''audio'''||'''korli'''|| || || ||
||'''r36497'''||'''debug'''||'''bonefish'''|| || || ||
||'''r36496'''||'''locale'''||'''zooey'''|| || || ||
||'''r36495'''||'''scsi_cd'''||'''bonefish'''|| || || ||
||'''r36494'''||'''device_manager'''||'''bonefish'''|| || || ||
||'''r36493'''||'''device_manager'''||'''bonefish'''|| || || ||
||'''r36492'''||'''device_manager'''||'''bonefish'''|| || || ||
||'''r36491'''||'''device_manager'''||'''bonefish'''|| || || ||
||'''r36490'''||'''mail'''||'''stippi'''|| || || ||
||'''r36489'''||'''vm'''||'''bonefish'''|| || || ||
||'''r36488'''||'''jam'''||'''stippi'''|| || || ||
||'''r36487'''||'''locale'''||'''zooey'''|| || || ||
||'''r36486'''||'''vm'''||'''bonefish'''|| || || ||
||'''r36485'''||'''locale'''||'''zooey'''|| || || ||
||'''r36484'''||'''installer'''||'''stippi'''|| || || ||
||'''r36483'''||'''mail'''||'''stippi'''|| || || ||
||'''r36482'''||'''installer'''||'''stippi'''|| || || ||
||'''r36481'''||'''bootman'''||'''stippi'''|| || || ||
||'''r36480'''||'''ahci'''||'''axeld'''|| || || ||
||'''r36479'''||'''jam'''||'''stippi'''|| || || ||
||'''r36478'''||'''app'''||'''stippi'''|| || || ||
||'''r36477'''||'''jam'''||'''scottmc'''|| || || ||
||'''r36476'''||'''icons'''||'''mmadia'''|| || || ||
||'''r36475'''||'''installer'''||'''korli'''|| || || ||
||'''r36474'''||'''drivers'''||'''tqh'''|| || || ||
||'''r36473'''||'''bin'''||'''korli'''|| || || ||
||'''r36472'''||'''audio'''||'''korli'''|| || || ||
||r36471||app||stippi|| ||ongoing discussion in #5821|| ||
||'''r36470'''||'''interface'''||'''stippi'''|| || || ||
||'''r36469'''||'''interface'''||'''zooey'''|| || || ||
||'''r36468'''||'''jam'''||'''scottmc'''|| || || ||
||'''r36467'''||'''aboutsystem'''||'''stippi'''|| || || ||
||'''r36466'''||'''jpeg2000'''||'''stippi'''|| || || ||
||'''r36465'''||'''jpeg'''||'''stippi'''|| || || ||
||''r36464''||''jam''||''zooey''||''bonefish''||''ok''|| ||
||'''r36463'''||'''shared'''||'''stippi'''|| || || ||
||'''r36462'''||'''shared'''||'''stippi'''|| ||bonefish||ok||
||'''r36461'''||'''screenshot'''||'''stippi'''||bonefish||ok|| ||
||r36460||scripts||mmadia|| || r36456 r36457 & r36460 are one meta-commit. || ||
||r36459||jam||mmadia|| || depends on r36456 r36457 & r36460 || ||
||'''r36458'''||'''device_manager'''||'''bonefish'''|| || || ||
||r36457||scripts||mmadia|| || r36456 r36457 & r36460 are one meta-commit. || ||
||r36456||scripts||mmadia|| || r36456 r36457 & r36460 are one meta-commit. || ||
||''r36455''||''tracker''||''anevilyak''||''stippi''||''ok''|| ||
||~~r36454~~||~~bluetooth~~||~~aljen~~|| ||bluetooth not in alpha 2||-
||'''r36453'''||'''interface'''||'''anevilyak'''|| || || ||
||'''r36452'''||'''media'''||'''korli'''|| || || ||
||'''r36451'''||'''print'''||'''bonefish'''|| ||ok (partially reverts r36413)|| ||
||~~r36450~~||~~bluetooth~~||~~oruizdorantes~~|| ||bluetooth not in alpha 2||-
||~~r36449~~||~~bluetooth~~||~~oruizdorantes~~|| ||bluetooth not in alpha 2||-
||~~r36448~~||~~bluetooth~~||~~oruizdorantes~~|| ||bluetooth not in alpha 2||-
||~~r36446~~||~~bluetooth~~||~~oruizdorantes~~|| ||bluetooth not in alpha 2||-
||~~r36445~~||~~bluetooth~~||~~oruizdorantes~~|| ||bluetooth not in alpha 2||-
||~~r36444~~||~~bluetooth~~||~~oruizdorantes~~|| ||bluetooth not in alpha 2||-
||'''r36443'''||'''interface'''||'''anevilyak'''|| || || ||
||r36442||jam||zooey||bonefish||ok||r36447||
||r36441||jam||stippi||bonefish||ok (tested)||r36447||
||r36440||jam||stippi||bonefish||ok||r36447||
||r36439||pthread||axeld||bonefish||ok||r36447||
||'''r36438'''||'''scsi_cd'''||'''bonefish'''|| || || ||
||r36437||jam||stippi||bonefish||ok||r36447||
||'''r36436'''||'''device_manager'''||'''bonefish'''|| || || ||
||r36435||jam||stippi||bonefish||ok||r36447||
||r36434||jam||zooey||bonefish||ok||r36447||
||r36433||jam||mmadia||bonefish||ok||r36447||
||r36432||jam||mmadia||bonefish||ok (update in r36433)||r36447||
||r36431||jam||scottmc||bonefish||ok (fixes in r36432,r36433)||r36447||
||r36430||ata||axeld||stippi||ok||r36447||
||r36429||ata||axeld||stippi||ok||r36447||
||r36428||jam||stippi||bonefish||ok||r36447||
||r36427||installer||stippi||bonefish||ok||r36447||
||r36426||less||mmadia||bonefish||ok||r36447||
||'''r36425'''||'''vm'''||'''bonefish'''|| || || ||
||r36424||filetypes||korli|| ||bonefish||ok||
||r36421||jam||tqh|| ||cleanup for r36420|| ||
||'''r36420'''||'''ACPI'''||'''tqh'''|| || || ||
||r36419||aboutsystem||mmadia||bonefish||ok||r36447||
||r36418||playlist||stippi||bonefish||ok||r36423||
||r36417||interface||stippi||bonefish||ok||r36423||
||r36416||ata||axeld||bonefish||probably ok (regression fixed in r36429)||r36447||
||r36415||drivers||axeld||bonefish||ok||r36447||
||r36414||scsi||axeld||bonefish||ok||r36447||
||'''r36413'''||'''print'''||'''pulkomandy'''||bonefish||ok (unapproved translations removed in r36451)|| ||
||r36412||ahci||axeld||bonefish||ok||r36447||
||r36411||ata||axeld||bonefish||ok||r36447||
||r36410||ahci||axeld||bonefish||ok (cleanup)||r36447||
||r36409||deskcalc||stippi||bonefish||ok||r36447||
||r36408||Tracker||anevilyak||stippi||ok||r36423||
||r36407||media server||korli||stippi||ok (don't know what it fixes, though)||r36423||
||r36406||build system||korli||stippi||ok||r36423||
||''r36405''||''FileTypes preferences''||''stippi''||''anevilyak''||''ok''|| ||
||r36404||team monitor||korli||stippi||ok (modal windows don't have Cmd-W shortcut by default)||r36423||
||r36403||kernel/VFS/boot||bonefish||stippi||ok||r36423||
||r36402||DeskCalc||stippi||bonefish||ok||r36447||
||r36401||libbe/interface||stippi||bonefish||ok||r36423||
||r36400||Keymap classes||axeld||stippi||ok||r36423||
||r36399||installoptionalpackage||mmadia||bonefish||ok||r36423||
||r36398||installoptionalpackage||mmadia||bonefish||ok||r36423||
||r36397||installoptionalpackage||mmadia||bonefish||ok||r36423||
||r36396||MediaPlayer||axeld||bonefish||ok||r36423||
||r36395||installoptionalpackage||mmadia||bonefish||ok||r36423||
||r36394||kernel/I/O scheduler||bonefish|| ||minor refactoring||r36423||
||~~r36393~~||~~radeon_hd driver~~||~~czeidler~~|| ||not alpha 2||-
||r36392||MediaPlayer||axeld||bonefish||ok||r36423||
||r36391||MediaPlayer||axeld||bonefish||regression fixed in r36396||r36423||
||r36390||libbe/BTextView||axeld||bonefish||ok||r36423||
||r36389||Deskbar||axeld||bonefish||ok||r36423||
||r36388||optional packages||mmadia||bonefish||ok||r36423||
||~~r36387~~||~~release branch~~||~~bonefish~~|| ||merge||-
||r36386||build system||mmadia||bonefish||ok||r36423||
||r36385||build system||bonefish|| || ||r36387||
||r36384||build system||bonefish|| || ||r36387||
||r36383||build system||bonefish|| || ||r36387||
||r36382||build system||axeld||bonefish||ok||r36387||
||r36381||build system||bonefish|| || ||r36387||
||r36380||optional packages||bonefish|| ||applied r36378||r36378||
||r36379||libroot||korli||bonefish||ok||r36387||
||~~r36378~~||~~optional packages~~||~~zooey~~|| ||in branch||-
||~~r36377~~||~~buildtools~~||~~zooey~~|| ||no branch||-
||~~r36376~~||~~buildtools~~||~~zooey~~|| ||no branch||-
||r36375||build system/keymap||axeld||bonefish||ok||r36387||
||'''r36374'''||'''kernel/VM'''||'''bonefish'''|| || || ||
||'''r36373'''||'''kernel/VM'''||'''bonefish'''|| || || ||
||'''r36372'''||'''kernel/VM'''||'''bonefish'''|| || || ||
||r36371||build system||axeld||bonefish||ok||r36387||
||r36370||libbshared/Keymap||axeld||bonefish||ok||r36387||
||r36369||libbe/BMenu||jackburton||bonefish||probably ok||r36447||
||r36368||libshared_build||axeld||bonefish||ok||r36387||
||r36367||libbe_build||axeld||bonefish||ok||r36387||
||r36366||libshared/Keymap||axeld||bonefish||ok||r36387||
||r36365||build system||mmadia||bonefish||ok||r36387||
||r36364||build system||mmadia||bonefish||ok||r36387||
||r36363||build system||mmadia||bonefish||ok||r36387||
||r36362||build system||mmadia||bonefish||ok||r36387||
||r36361||build system||mmu_man||bonefish||ok||r36387||
||r36360||kernel/VM||bonefish|| ||style cleanup||r36387||
||~~r36359~~||~~test~~||~~bonefish~~|| ||test only||-
||r36358||ext2||korli||axeld||ok||r36447||
||r36357||libbe/locale||zooey||bonefish||ok||r36387||
||r36356||libroot||korli||bonefish||partially incorrect (fixed in r36379)||r36387||
||r36355||build system||bonefish|| || ||r36387||
||~~r36354~~||~~buildtools~~||~~bonefish~~|| ||no branch||-
||r36353||build system||bonefish|| || ||r36387||
||r36352||libroot||bonefish||axeld||ok||r36447||
||r36351||libroot||bonefish||axeld||ok||r36447||
||r36350||build system||bonefish|| || ||r36387||
||r36349||build system||bonefish|| || ||r36387||