Merge branch 'master' of ssh://lux:/home/lxf/git/register

4 files changed, 6 insertions, 0 deletions

diff --git a/invoices/scott_gilbertson_invoice_84.doc b/invoices/paid/scott_gilbertson_invoice_84.doc
index d9af18e..d9af18e 100644
--- a/invoices/scott_gilbertson_invoice_84.doc
+++ b/invoices/paid/scott_gilbertson_invoice_84.doc
diff --git a/invoices/scott_gilbertson_invoice_85.doc b/invoices/scott_gilbertson_invoice_85.doc
new file mode 100644
index 0000000..52c0f8b
--- /dev/null
+++ b/invoices/scott_gilbertson_invoice_85.doc
diff --git a/opensourceinsider.txt b/opensourceinsider.txt
new file mode 100644
index 0000000..c9a2777
--- /dev/null
+++ b/opensourceinsider.txt
@@ -0,0 +1,6 @@
+
+One frequently lobbed criticism of open source projects is that they're "just copying" proprietary efforts along the same lines. Some times this is true, though rarely is it entirely true. To pick one frequently cited example, the GNU Image Manipulation Program, better known as GIMP, did arrive many years after Adobe Photoshop first appeared on the scene. However, features many users think of a starting in Photoshop and being copied by GIMP in fact came from GIMP, for example, content-aware fill was a GIMP plugin long before it became part of Photoshop.
+
+Still there is some truth to the idea that proprietary software is better at probing markets to figure out what works and what doesn't. The fact is proprietary software generally has more capital behind it. However, at the same time, open source can often do things proprietary software can't, like ship experimental ideas such as content-aware fill long before their proprietary counterparts.
+
+
diff --git a/openstreetview.jpg b/openstreetview.jpg
new file mode 100644
index 0000000..008e47f
--- /dev/null
+++ b/openstreetview.jpg