Changeset 11048 for ossiedev/branches/jsnyder/trunk/Makefile.am
- Timestamp:
- 03/07/12 14:46:40 (15 months ago)
- Location:
- ossiedev/branches/jsnyder/trunk
- Files:
-
- 2 modified
-
. (modified) (1 prop)
-
Makefile.am (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
ossiedev/branches/jsnyder/trunk
-
Property
svn:mergeinfo set
to
/ossiedev/branches/june/trunk merged eligible /ossiedev/trunk merged eligible
-
Property
svn:mergeinfo set
to
-
ossiedev/branches/jsnyder/trunk/Makefile.am
r11006 r11048 9 9 platform/domain \ 10 10 platform/dtd \ 11 platform/Sound_in \ 12 platform/Sound_out \ 13 platform/PulseAudio \ 14 platform/USRP \ 15 platform/USRP2 \ 16 platform/XilinxFPGA \ 11 17 platform/nodes/default_GPP_node \ 18 platform/nodes/default_GPP_PulseAudio_node \ 12 19 platform/GPP \ 13 20 waveforms/ossie_demo \ 21 waveforms/ml403_ossie_demo \ 22 waveforms/OSSIETalkUSRP \ 23 waveforms/OSSIETalkLoopBack \ 24 waveforms/Lab5Example \ 25 waveforms/pass_data_waveform \ 26 waveforms/pulseaudio_demo \ 27 components/am_demod \ 14 28 components/amplifier \ 15 29 components/ChannelDemo \ 30 components/Conv_Dec \ 31 components/Conv_Enc \ 32 components/Decimator \ 33 components/DigitalModem \ 34 components/FrameAssembler \ 35 components/Interpolator \ 36 components/OSSIETalk \ 37 components/PacketResizer \ 38 components/pass_data \ 16 39 components/RxDemo \ 17 components/TxDemo 40 components/SymbolSyncPoly \ 41 components/TxDemo \ 42 components/USRP_Commander \ 43 components/WFMDemod \ 44 components/readBytesfromFile \ 45 components/writeBytestoFile \ 46 components/EchoSound \ 47 components/Sound_Commander \ 48 tools 18 49 19 50 if WITHNB