diff options
| author | EliteTK <tomasz.kramkowski@gmail.com> | 2014-11-17 00:47:25 +0000 |
|---|---|---|
| committer | EliteTK <tomasz.kramkowski@gmail.com> | 2014-11-17 00:47:25 +0000 |
| commit | ba89450de861fd71b4112f403e88f1e3e4380804 (patch) | |
| tree | cf02b1022523cac428a609617fdfa9c700a61ae2 | |
| parent | f7edafe7752c7545deb43e2b253735b7abd4b7cd (diff) | |
| parent | 697360a05a603db88f945388386ffa5ba32dfcf6 (diff) | |
| download | c-stuff-ba89450de861fd71b4112f403e88f1e3e4380804.tar.gz c-stuff-ba89450de861fd71b4112f403e88f1e3e4380804.tar.xz c-stuff-ba89450de861fd71b4112f403e88f1e3e4380804.zip | |
Merge branch 'master' of https://github.com/EliteTK/c-stuff
Conflicts:
xcb_gol_macro.c
| -rw-r--r-- | xcb_gol_macro.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xcb_gol_macro.c b/xcb_gol_macro.c index 2f8f2af..d41290e 100644 --- a/xcb_gol_macro.c +++ b/xcb_gol_macro.c @@ -183,4 +183,3 @@ int main(int argc, char **argv) } return 0; } - |