Changeset 36441 for trunk/ippTools/src
- Timestamp:
- Jan 14, 2014, 2:28:47 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
- 3 copied
-
. (modified) (1 prop)
-
ippTools/src (modified) (2 props)
-
ippTools/src/Makefile.am (modified) (3 diffs)
-
ippTools/src/camtool.c (modified) (1 prop)
-
ippTools/src/camtoolConfig.c (modified) (1 prop)
-
ippTools/src/fftool.c (copied) (copied from branches/bills_branches/bills_201312/ippTools/src/fftool.c )
-
ippTools/src/fftool.h (copied) (copied from branches/bills_branches/bills_201312/ippTools/src/fftool.h )
-
ippTools/src/fftoolConfig.c (copied) (copied from branches/bills_branches/bills_201312/ippTools/src/fftoolConfig.c )
-
ippTools/src/magictool.c (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/bills_branches/bills_201312 (added) merged: 36383,36386,36388-36396,36406-36407,36409-36412,36415-36420,36422-36427,36433,36436-36439
- Property svn:mergeinfo changed
-
trunk/ippTools/src
- Property svn:ignore
-
old new 47 47 sctool 48 48 releasetool 49 fftool
-
- Property svn:mergeinfo changed
/branches/bills_branches/bills_201312/ippTools/src (added) merged: 36386,36392,36395,36409,36411,36417,36437
- Property svn:ignore
-
trunk/ippTools/src/Makefile.am
r34913 r36441 33 33 vptool \ 34 34 sctool \ 35 releasetool 35 releasetool \ 36 fftool 36 37 37 38 pkginclude_HEADERS = \ … … 87 88 vptool.h \ 88 89 sctool.h \ 89 releasetool.h 90 releasetool.h \ 91 fftool.h 90 92 91 93 lib_LTLIBRARIES = libpxtools.la … … 332 334 releasetoolConfig.c 333 335 336 fftool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS) 337 fftool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la 338 fftool_SOURCES = \ 339 fftool.c \ 340 fftoolConfig.c 341 334 342 clean-local: 335 343 -rm -f TAGS -
trunk/ippTools/src/camtool.c
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTools/src/camtoolConfig.c
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/ippTools/src/magictool.c
- Property svn:mergeinfo changed (with no actual effect on merging)
Note:
See TracChangeset
for help on using the changeset viewer.
