Merge branch 'master' of ssh://git.code.sf.net/p/wesnoth/code

This commit is contained in:
Mark de Wever 2013-03-29 22:03:35 +01:00
commit fb6f4ec462
2 changed files with 4 additions and 0 deletions

View file

@ -1,4 +1,6 @@
.objs*
objs*
*.depend
*.layout
*_build_log.html
liblua.a

View file

@ -556,6 +556,8 @@
<Unit filename="..\..\src\gui\dialogs\network_transmission.hpp" />
<Unit filename="..\..\src\gui\dialogs\popup.cpp" />
<Unit filename="..\..\src\gui\dialogs\popup.hpp" />
<Unit filename="..\..\src\gui\dialogs\rename_unit.cpp" />
<Unit filename="..\..\src\gui\dialogs\rename_unit.hpp" />
<Unit filename="..\..\src\gui\dialogs\simple_item_selector.cpp" />
<Unit filename="..\..\src\gui\dialogs\simple_item_selector.hpp" />
<Unit filename="..\..\src\gui\dialogs\tip.cpp" />