From d30573a0e0a933c6bc72c1a769a5636ff47822a6 Mon Sep 17 00:00:00 2001
From: jj <jj@jj>
Date: Thu, 10 May 2012 22:57:11 +0200
Subject: [PATCH 1/2] probe: fix gcc warning

---
 plugins/probe.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/probe.cpp b/plugins/probe.cpp
index eb622e789..b7b7d298f 100644
--- a/plugins/probe.cpp
+++ b/plugins/probe.cpp
@@ -232,7 +232,7 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
     int eindex = evi > 65 ? 2 : evi < 33 ? 0 : 1;
     int surr = sindex + eindex * 3;
 
-    char* surroundings[] = { "Serene", "Mirthful", "Joyous Wilds", "Calm", "Wilderness", "Untamed Wilds", "Sinister", "Haunted", "Terrifying" };
+    const char* surroundings[] = { "Serene", "Mirthful", "Joyous Wilds", "Calm", "Wilderness", "Untamed Wilds", "Sinister", "Haunted", "Terrifying" };
 
     // biome, geolayer
     out << "biome: " << des.bits.biome << " (" << 

From 92f069e20932b4ee2f781e5049bcab33a1dfed09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Fri, 11 May 2012 07:00:18 +0200
Subject: [PATCH 2/2] Brush output lists numbers, update xml.

---
 library/xml       |  2 +-
 plugins/Brushes.h | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/library/xml b/library/xml
index 5707a6aa0..970bb0ae9 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 5707a6aa0c035348c8769058ed77b320f9b1436c
+Subproject commit 970bb0ae9530e9c0522cb0ca8fe357815d72fab1
diff --git a/plugins/Brushes.h b/plugins/Brushes.h
index a525d279c..25f3a511b 100644
--- a/plugins/Brushes.h
+++ b/plugins/Brushes.h
@@ -1,4 +1,9 @@
 #pragma once
+#include <llimits.h>
+#include <sstream>
+#include <string>
+#include <stack>
+#include <set>
 
 typedef vector <df::coord> coord_vec;
 class Brush
@@ -60,10 +65,15 @@ public:
     };
     ~RectangleBrush(){};
     std::string str() const {
-        if (x_ == 1 && y_ == 1 && z_ == 1) {
+        if (x_ == 1 && y_ == 1 && z_ == 1)
+        {
             return "point";
-        } else {
-            return "rectangle";
+        }
+        else
+        {
+            std::ostringstream ss;
+            ss << "rect: " << x_ << "/" << y_ << "/" << z_ << std::endl;
+            return ss.str();
         }
     }
 private: