[Fenfire-dev] Merging

[Tuomas Lukka]

[18:25:24] -archbot- address@hidden/libvob--jvk--0.1--patch-2: color work and 
merges official 
(vob/color/matrix.py+ vob/usertest/color6.py+ 
doc/pegboard/single_focus_manager--mudyc/peg.rst 
doc/pegboard/vob_calendar--mudyc/peg.rst 
doc/pegboard/vob_event_action--mudyc/peg.rst 
doc/pegboard/vobcoorder_generator--mudyc/peg.rst rundemo.py 
vob/buoy/buoymanager.py 
vob/color/spaces.py vob/demo/lava/chroma.py vob/demo/mouse/moves.py 
vob/putil/demo.py)

One *important* thing: **NEVER** commit a star-merge and other stuff at the 
same time - 
it can seriously screw up my merging your branch to mainline.

**ALWAYS** commit merges alone: first commit your changes, then merge, then 
commit the merge 
IN A SINGLE COMMIT.

        Tuomas