Merge branch 'master' of https://github.com/Sourcegasm/RiftVision

enovations · Sep 23, 2015 · be1ea1e · be1ea1e
2 parents e6d1f98 + 7c14a95
commit be1ea1e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Sourcegasm
+Copyright (c) 2015 Sourcegasm(Vid Drobnič, Klemen Pevec, Žiga Patačko Koderman)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Here are some of the implemanted features:
 ![](http://www.auplod.com/u/opauld5f883.gif)
  - gksudo (if you don't already have it)
  - PyGame Python library (Debian-like distros: sudo apt-get install python-pygame)
- - LWJGL
+ - LWJGL (version compatible with Linux is already located in the lib directory of the project, including natives)
 
 ![](http://i.imgur.com/aw0QuDg.gif)
 

diff --git a/start.sh b/start.sh
@@ -0,0 +1,2 @@
+java -jar RiftVision.jar &
+bash start_python.sh &
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		java -jar RiftVision.jar &
		bash start_python.sh &