diff options
| author | zlg <zlg@zlg.space> | 2010-10-13 05:50:54 -0500 |
|---|---|---|
| committer | zlg <zlg@zlg.space> | 2010-10-13 05:50:54 -0500 |
| commit | ad362f0a8d68bb39390b5dc99604a036dba33b83 (patch) | |
| tree | e45ff3f5ca053f5aa80f1dfbfd5e1c8b14910f06 | |
| parent | Initial commit (diff) | |
| parent | Initial commit (diff) | |
| download | gimpixel-ad362f0a8d68bb39390b5dc99604a036dba33b83.tar.gz gimpixel-ad362f0a8d68bb39390b5dc99604a036dba33b83.tar.bz2 gimpixel-ad362f0a8d68bb39390b5dc99604a036dba33b83.tar.xz gimpixel-ad362f0a8d68bb39390b5dc99604a036dba33b83.zip | |
Merge branch 'master' of github.com:sporkbox/gimpixel
Conflicts:
README.mdown
| -rw-r--r-- | README.mdown | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/README.mdown b/README.mdown index 50f505c..895229e 100644 --- a/README.mdown +++ b/README.mdown @@ -1,6 +1,9 @@ # What is GIMPixel? GIMPixel is a set of brushes, palettes, and image templates designed to turn GIMP into an enjoyable piece of pixeling software. It's still in its infancy, so if you know a thing or two about configuring GIMP or would like to contribute brushes, palettes, or more, don't hesitate to join in! +<<<<<<< HEAD ## Usage To use GIMPixel, you must run GIMP after changing the "GIMP2_DIRECTORY" environment variable. To do so, just run something like `GIMP2_DIRECTORY=.gimpixel gimp` and it should work without messing with your existing GIMP configuration. +======= +>>>>>>> 0366146471c99705a0c176a3c7484a89693448d0 |