Merge pull request #50 from radegastdev/develop

Merge in premake branch
radegastdev · Aug 10, 2016 · c14ee17 · c14ee17
2 parents ad0cadd + 001bc10
commit c14ee17
Show file tree

Hide file tree

Showing 21 changed files with 631 additions and 673 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,4 @@ compile.bat
 *.resources
 *~
 *.userprefs
-.vs
+.vs
diff --git a/NullBuild.txt b/NullBuild.txt
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Developers:
 # License
 
 **Radegast Metaverse Client**<br>
-*Copyright © 2009-2011, Radegast Development Team*<br>
+*Copyright © 2009-2016, Radegast Development Team*<br>
 *All rights reserved.*
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -73,3 +73,7 @@ http://commandline.codeplex.com/<br>
 Uses code snippets from CSAT Library (MIT License)<br>
 Copyright © 2011 mjt<br>
 http://code.google.com/p/csat/<br>
+
+Uses SmartIrc4net (LGPL)<br>
+Copyright © 2003-2005 Mirco Bauer<br>
+http://www.meebey.net/projects/smartirc4net/<br>
diff --git a/Radegast/prebuild.exe b/Radegast/prebuild.exe
diff --git a/build/README.txt b/build/README.txt
@@ -0,0 +1 @@
+You can find the most current version of premake5 at https://premake.github.io/download.html
diff --git a/build/linux/premake5 b/build/linux/premake5
diff --git a/build/linux/version.txt b/build/linux/version.txt
@@ -0,0 +1 @@
+build-7-linux-travis_ci-2016-07-24
diff --git a/build/macosx/premake5 b/build/macosx/premake5
diff --git a/build/macosx/version.txt b/build/macosx/version.txt
@@ -0,0 +1 @@
+build-7-osx-travis_ci-2016-07-24
diff --git a/build/windows/premake5.exe b/build/windows/premake5.exe
diff --git a/plugins/Radegast.Plugin.IRC/Radegast.Plugin.IRC.csproj b/plugins/Radegast.Plugin.IRC/Radegast.Plugin.IRC.csproj
diff --git a/...RadSpeechMac/Assemblies/Monobjc.Cocoa.dll → ...RadSpeechMac/assemblies/Monobjc.Cocoa.dll b/...RadSpeechMac/Assemblies/Monobjc.Cocoa.dll → ...RadSpeechMac/assemblies/Monobjc.Cocoa.dll
diff --git a/...peech/RadSpeechMac/Assemblies/Monobjc.dll → ...peech/RadSpeechMac/assemblies/Monobjc.dll b/...peech/RadSpeechMac/Assemblies/Monobjc.dll → ...peech/RadSpeechMac/assemblies/Monobjc.dll
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ compile.bat @@
     *.resources
     *~
     *.userprefs
-    .vs
+    .vs
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		You can find the most current version of premake5 at https://premake.github.io/download.html