Merge branch 'journalfix' of https://github.com/zinnschlag/openmw.git into journal

apps/openmw/mwdialogue/journalentry.cpp

@@ -42,7 +42,7 @@ namespace MWDialogue
             iter!=dialogue->mInfo.end(); ++iter)
             if (iter->data.disposition==index) /// \todo cleanup info structure
             {
-                iter->id;
+                return iter->id;
             }
 
         throw std::runtime_error ("unknown journal index for topic " + topic);

components/CMakeLists.txt

@@ -64,3 +64,5 @@ add_component_dir (interpreter
 include_directories(${BULLET_INCLUDE_DIRS})
 
 add_library (components STATIC ${COMPONENT_FILES})
+
+target_link_libraries (components ${Boost_LIBRARIES} ${OGRE_LIBRARIES})