Carmelo Piccione, Peter Sperl carmelo.piccione@gmail.com, psperl@gmail.com 1 KDevCustomProject C++ projectmDev10 ../../ false <<<<<<< .mine ======= >>>>>>> .r389 kdevsubversion custom /usr/local/bin/xmms <<<<<<< .mine ======= /home/pete/trunk/src >>>>>>> .r389 false false true true false /home/carm/projects/dev-1.0/src/ *.java *.h *.H *.hh *.hxx *.hpp *.c *.C *.cc *.cpp *.c++ *.cxx Makefile CMakeLists.txt make <<<<<<< .mine /home/carm/projects/trunk/src/projectM-engine ======= /home/pete/trunk/src/projectM-engine >>>>>>> .r389 0 default true 1 0 false make default true false false true true 10 ada ada_bugs_gcc bash bash_bugs clanlib fortran_bugs_gcc gnome1 gnustep gtk gtk_bugs haskell haskell_bugs_ghc java_bugs_gcc java_bugs_sun kde2book opengl pascal_bugs_fp php php_bugs perl perl_bugs python python_bugs qt-kdev3 ruby ruby_bugs sdl sw w3c-dom-level2-html w3c-svg w3c-uaag10 wxwidgets_bugs Guide to the Qt Translation Tools Qt Assistant Manual Qt Designer Manual Qt Reference Documentation qmake User Guide KDE Libraries (Doxygen) false 3 3 /usr/qt/3 EmbeddedKDevDesigner /usr/qt/3/bin/qmake /usr/qt/3/bin/designer true false true 250 400 250 false 0 false true true std=_GLIBCXX_STD;__gnu_cxx=std true true true true true true true true .; true true true true set m_,_ theValue true true false true Vertical .hpp .cpp false false *.o,*.lo,CVS false false /home/carm/projects/projectM/dev-1.0/tags