[tuhopuu-cvs] CVS commit: tuhopuu3/extern/freetype .cvsignore ChangeLog INSTALL Jamfile Jamrules Makefile README descrip.mms tuhopuu3/extern/freetype/builds detect.mk freetype.mk link_dos.mk link_std.mk modules.mk newline toplevel.mk ...
Chris Want
cwant at ualberta.ca
Mon Feb 28 02:03:08 CET 2005
hos (Chris Want) 2005/02/28 02:03:08 CET
Modified files:
tuhopuu3/source/blender/blenlib BLI_arithb.h
tuhopuu3/source/blender/blenlib/intern arithb.c
tuhopuu3/source/blender/src drawobject.c editobject.c
editview.c header_text.c toolbox.c
transform.c transform.h
transform_constraints.c
transform_generics.c
transform_numinput.c
Removed files:
tuhopuu3/extern/freetype .cvsignore ChangeLog INSTALL Jamfile
Jamrules Makefile README descrip.mms
tuhopuu3/extern/freetype/builds detect.mk freetype.mk
link_dos.mk link_std.mk
modules.mk newline toplevel.mk
tuhopuu3/extern/freetype/builds/amiga README smakefile
tuhopuu3/extern/freetype/builds/amiga/include/freetype/config
ftconfig.h
ftmodule.h
tuhopuu3/extern/freetype/builds/amiga/src/base ftdebug.c
ftsystem.c
tuhopuu3/extern/freetype/builds/ansi ansi-def.mk ansi.mk
tuhopuu3/extern/freetype/builds/beos beos-def.mk beos.mk
detect.mk
tuhopuu3/extern/freetype/builds/compiler ansi-cc.mk bcc-dev.mk
bcc.mk gcc-dev.mk
gcc.mk intelc.mk
unix-lcc.mk
visualage.mk
visualc.mk watcom.mk
win-lcc.mk
tuhopuu3/extern/freetype/builds/dos detect.mk dos-def.mk
dos-gcc.mk
tuhopuu3/extern/freetype/builds/mac README ftlib.prj
tuhopuu3/extern/freetype/builds/os2 detect.mk os2-def.mk
os2-dev.mk os2-gcc.mk
tuhopuu3/extern/freetype/builds/unix .cvsignore aclocal.m4
config.guess config.sub
configure configure.ac
detect.mk
freetype-config.in
ft2unix.h ftconfig.in
ftsystem.c install-sh
install.mk ltmain.sh
mkinstalldirs unix-cc.in
unix-def.in unix-dev.mk
unix-lcc.mk unix.mk
unixddef.mk
tuhopuu3/extern/freetype/builds/vms descrip.mms ftconfig.h
ftsystem.c
tuhopuu3/extern/freetype/builds/win32 detect.mk w32-bcc.mk
w32-bccd.mk w32-dev.mk
w32-gcc.mk w32-icc.mk
w32-intl.mk w32-lcc.mk
w32-mingw32.mk
w32-vcc.mk w32-wat.mk
win32-def.mk
tuhopuu3/extern/freetype/builds/win32/visualc freetype.dsp
freetype.dsw
index.html
tuhopuu3/extern/freetype/docs BUGS BUILD CHANGES FTL.txt
GPL.txt PATENTS license.txt
readme.vms todo
tuhopuu3/extern/freetype/include ft2build.h
tuhopuu3/extern/freetype/include/freetype freetype.h ftbbox.h
ftcache.h
ftchapters.h
fterrors.h ftglyph.h
ftimage.h ftlist.h
ftmac.h ftmm.h
ftmoderr.h
ftmodule.h ftoutln.h
ftrender.h ftsizes.h
ftsnames.h ftsynth.h
ftsystem.h
fttrigon.h fttypes.h
t1tables.h
ttnameid.h
tttables.h tttags.h
tuhopuu3/extern/freetype/include/freetype/cache ftcchunk.h
ftcglyph.h
ftcimage.h
ftcmanag.h
ftcsbits.h
ftlru.h
tuhopuu3/extern/freetype/include/freetype/config ftconfig.h
ftheader.h
ftmodule.h
ftoption.h
tuhopuu3/extern/freetype/include/freetype/internal autohint.h
cfftypes.h
fnttypes.h
ftcalc.h
ftdebug.h
ftdriver.h
ftextend.h
ftmemory.h
ftobjs.h
ftstream.h
internal.h
pcftypes.h
psaux.h
psnames.h
sfnt.h
t1types.h
tttypes.h
tuhopuu3/extern/freetype/make/msvc_7_0 freetype.vcproj
tuhopuu3/extern/freetype/objs .cvsignore README
tuhopuu3/extern/freetype/src Jamfile
tuhopuu3/extern/freetype/src/autohint CatharonLicense.txt
Jamfile ahangles.c
ahangles.h aherrors.h
ahglobal.c ahglobal.h
ahglyph.c ahglyph.h
ahhint.c ahhint.h
ahloader.h ahmodule.c
ahmodule.h ahoptim.c
ahoptim.h ahtypes.h
autohint.c descrip.mms
mather.py module.mk
rules.mk
tuhopuu3/extern/freetype/src/base Jamfile descrip.mms ftbase.c
ftbbox.c ftcalc.c ftdebug.c
ftextend.c ftglyph.c
ftinit.c ftlist.c ftmac.c
ftmm.c ftnames.c ftobjs.c
ftoutln.c ftstream.c
ftsynth.c ftsystem.c
fttrigon.c rules.mk
tuhopuu3/extern/freetype/src/cache Jamfile descrip.mms
ftcache.c ftcchunk.c
ftcerror.h ftcglyph.c
ftcimage.c ftcmanag.c
ftcsbits.c ftlru.c rules.mk
tuhopuu3/extern/freetype/src/cff Jamfile cff.c cffdrivr.c
cffdrivr.h cfferrs.h
cffgload.c cffgload.h
cffload.c cffload.h cffobjs.c
cffobjs.h cffparse.c
cffparse.h cfftoken.h
descrip.mms module.mk
rules.mk
tuhopuu3/extern/freetype/src/cid Jamfile ciderrs.h cidgload.c
cidgload.h cidload.c
cidload.h cidobjs.c cidobjs.h
cidparse.c cidparse.h
cidriver.c cidriver.h
cidtoken.h descrip.mms
module.mk rules.mk type1cid.c
tuhopuu3/extern/freetype/src/pcf Jamfile descrip.mms module.mk
pcf.c pcf.h pcfdriver.c
pcfdriver.h pcferror.h
pcfread.c pcfutil.c pcfutil.h
readme rules.mk
tuhopuu3/extern/freetype/src/psaux Jamfile descrip.mms
module.mk psaux.c
psauxerr.h psauxmod.c
psauxmod.h psobjs.c
psobjs.h rules.mk
t1decode.c t1decode.h
tuhopuu3/extern/freetype/src/psnames Jamfile descrip.mms
module.mk psmodule.c
psmodule.h psnamerr.h
psnames.c pstables.h
rules.mk
tuhopuu3/extern/freetype/src/raster Jamfile descrip.mms
ftraster.c ftraster.h
ftrend1.c ftrend1.h
module.mk raster.c
rasterrs.h rules.mk
tuhopuu3/extern/freetype/src/sfnt Jamfile descrip.mms
module.mk rules.mk
sfdriver.c sfdriver.h
sferrors.h sfnt.c sfobjs.c
sfobjs.h ttcmap.c ttcmap.h
ttload.c ttload.h ttpost.c
ttpost.h ttsbit.c ttsbit.h
tuhopuu3/extern/freetype/src/smooth Jamfile descrip.mms
ftgrays.c ftgrays.h
ftsmerrs.h ftsmooth.c
ftsmooth.h module.mk
rules.mk smooth.c
tuhopuu3/extern/freetype/src/tools cordic.py docmaker.py
glnames.py test_bbox.c
test_trig.c
tuhopuu3/extern/freetype/src/truetype Jamfile descrip.mms
module.mk rules.mk
truetype.c ttdriver.c
ttdriver.h tterrors.h
ttgload.c ttgload.h
ttinterp.c ttinterp.h
ttobjs.c ttobjs.h
ttpload.c ttpload.h
tuhopuu3/extern/freetype/src/type1 Jamfile descrip.mms
module.mk rules.mk t1afm.c
t1afm.h t1driver.c
t1driver.h t1errors.h
t1gload.c t1gload.h
t1load.c t1load.h t1objs.c
t1objs.h t1parse.c
t1parse.h t1tokens.h
type1.c
tuhopuu3/extern/freetype/src/winfonts Jamfile descrip.mms
fnterrs.h module.mk
rules.mk winfnt.c
winfnt.h
Log:
Post-merge conflict resolution.
Revision Changes Path
1.5 +5 -0 tuhopuu3/source/blender/blenlib/BLI_arithb.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/BLI_arithb.h.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.6 +8 -0 tuhopuu3/source/blender/blenlib/intern/arithb.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.14 +1 -0 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.12 +7 -7 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.6 +2 -2 tuhopuu3/source/blender/src/editview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editview.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.3 +34 -5 tuhopuu3/source/blender/src/header_text.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_text.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.9 +13 -12 tuhopuu3/source/blender/src/toolbox.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/toolbox.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.15 +776 -303 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.10 +34 -12 tuhopuu3/source/blender/src/transform.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.12 +76 -37 tuhopuu3/source/blender/src/transform_constraints.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.9 +170 -49 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
1.3 +11 -11 tuhopuu3/source/blender/src/transform_numinput.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_numinput.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list