@eyedeekay
&zzz
+FreefallHeavens_
+R4SAS
+RN_
+Romster_
+StormyCloud
+acetone
+cims
+eche|off
+hagen
+nilbog
+nyaa2pguy
+orignal
+postman
+qend-irc2p
+snex
Arch
Danny
Holmes
Irc2PGuest14026
Irc2PGuest26254
Irc2PGuest28384
Irc2PGuest36664
OfficialCIA
Onn4l7h
Onn4|7h
Over
Sleepy
T3s|4_
U1F642
Zapek2
aargh4
ac9f
ahiru
ananas_
anontor
dr4wd3
eyedeekay_
eyedeekay_bnc
leopold
mahlay
makoto
marek
mareki2p_
n2_
newbie|2
not_bob_afk2
pinotto
poriori
profetikla
r00tobo
rapidash
sahil
test7363673
uop23ip
urist_
x74a6
zelgomer
zzz
eyedeekay, I'm in trouble here, there's a lot more to do than I thought
zzz
I need to rebase so I can see what I'm doing
zzz
what branch should I rebase into or should I create yet another one?
eyedeekay
Creating another one is probably easiest to keep track of
zzz
ok, will do, thanks
zzz
ok still had that build.xml conflict but fixed it. pushed jetty12-rb which is the same as jetty12-2 but rebased to master
zzz
where are we with the SAM PR? you were going to do a command line merge?
eyedeekay
Yes I am going to do a local merge and push it onto master myself
eyedeekay
Can do that for all of them unless you would rather do it for jetty12
zzz
just do the SAM one for now, nothing else is ready, we can decide when we get there
eyedeekay
Ok