Viewing all changes in revision 10948.
- Committer: Cezar Andrei
- Date: 2012-09-19 17:31:12 UTC
- mfrom: (10946.1.1 fread-pdf-trunk)
- Revision ID: cezar.lp@cezarandrei.com-20120919173112-y1dh0mhjt181t0l7
Merge in Chris' change and resolve conflict..
- files added:
- test/rbkt/modules/ext2_config.txt.in
- files modified:
- cmake_modules/ZorbaModule.cmake
expand all
collapse all
added
removed
