summary refs log tree commit diff stats
path: root/.gitignore
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2013-09-29 02:24:30 -0400
committerTingPing <tingping@tingping.se>2013-09-29 02:24:30 -0400
commit00bd389cdcd3e481c92de435e626a2618d4a128c (patch)
treeed9852f20ab8dff18672b29eaccce05878251d38 /.gitignore
parent4ba886f7aaf884c518637173be0b1d8e9b190e86 (diff)
parent1f84c507a058f5baa01a632ce2478fa31854907d (diff)
Merge branch 'gresource'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index df260d40..c1f83656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ conftest.c
 conftest.err
 config.guess
 config.h.in
+config.h.in~
 config.h
 config.log
 config.status
@@ -34,7 +35,7 @@ po/Makefile.in.in
 po/POTFILES
 po/remove-potcdate.sed
 po/stamp-po
-share/pkgconfig/hexchat-plugin.pc
+data/pkgconfig/hexchat-plugin.pc
 src/common/dbus/example
 src/common/dbus/marshallers.h
 src/common/dbus/org.hexchat.service.service
@@ -61,7 +62,7 @@ stamp-h1
 # Win32 generated files
 plugins/wmpa/wmpa_h.h
 plugins/wmpa/wmpa_i.c
-src/pixmaps/inline_pngs.h
+src/fe-gtk/resources.c
 src/htm/obj/*
 win32/ipch/*
 win32/ext/perl/perl-x86-cache