Skip to content
Browse files

Merge branch 'bugfixes' into 3.1

* bugfixes:
  Add files missing from 1e5fafa.
  Add header for std::sort.
  • Loading branch information...
2 parents 050866e + 552a60b commit 26db798f42f9685dd62b587f33c89e17d6b9b36a @cybersphinx cybersphinx committed Aug 6, 2012
View
BIN data/base/images/frontend/image_no_lassat.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/images/frontend/image_no_uplink.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1 lib/ivis_opengl/bitimage.cpp
@@ -26,6 +26,7 @@
#include "tex.h"
#include <set>
+#include <algorithm>
struct ImageMergeRectangle

0 comments on commit 26db798

Please sign in to comment.
Something went wrong with that request. Please try again.