Skip to content

Commit fa8a8ae

Browse files
HeikoKoehnHeikoKoehn
committed
Merge commit 'bruno/master'
2 parents 3221af1 + c42f827 commit fa8a8ae

265 files changed

Lines changed: 4 additions & 5 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ moc_*.cpp
55
ui_*.h
66
*.exe
77
*~
8-
mudlet/prealpha1/mudlet/src/mudlet
9-
mudlet/prealpha1/mudlet/Makefile
10-
mudlet/prealpha1/mudlet/src/Makefile
8+
src/mudlet
9+
Makefile
10+
src/Makefile
1111
.svn*
1212
mudlet.kdevelop.pcs
1313
Makefile
@@ -18,4 +18,4 @@ cmake_install.cmake
1818
CPackConfig.cmake
1919
CPackSourceConfig.cmake
2020
_CPack_Packages
21-
install_manifest.txt
21+
install_manifest.txt

mudlet/prealpha1/mudlet/CMakeLists.txt renamed to CMakeLists.txt

File renamed without changes.

mudlet/prealpha1/mudlet/COPYING renamed to COPYING

File renamed without changes.

mudlet/prealpha1/mudlet/Doxyfile renamed to Doxyfile

File renamed without changes.

mudlet/prealpha1/mudlet/MudletCPack.cmake renamed to MudletCPack.cmake

File renamed without changes.

mudlet/prealpha1/mudlet/cmake/FindLua51.cmake renamed to cmake/FindLua51.cmake

File renamed without changes.

mudlet/prealpha1/mudlet/cmake/FindMinGW.cmake renamed to cmake/FindMinGW.cmake

File renamed without changes.

mudlet/prealpha1/mudlet/cmake/FindPCRE.cmake renamed to cmake/FindPCRE.cmake

File renamed without changes.

mudlet/prealpha1/mudlet/cmake/FindQScintilla.cmake renamed to cmake/FindQScintilla.cmake

File renamed without changes.

mudlet/prealpha1/mudlet/mudlet.desktop renamed to mudlet.desktop

File renamed without changes.

0 commit comments

Comments
 (0)