labofsahil/github-event-dataset-2012 huggingface dataset:
The unfolding of a ground schema clause term has been implemented.
(Example 6.5 from the journal paper)
The unfolding is with respect to the arithmetical variables only.
For the case of clause variables and schema clause term variables will be ready soon.









git-svn-id: http://gapt.googlecode.com/svn/trunk/source@1186 85d21ef8-add0-11de-ae77-5bfb9c5a3f34
The parsing and unfolding of a resolution schemata is ready. Only the parsing
of the second-order substitution is not ready, but when it is hard-coded
everything works fine. A resolution refutation which verifies the
correctness of the resolution schemata (see the .rs file) is also produced.


IMPORTANT: For the resolution refutation which uses a cut-rule I had to change in calculus/lk 
the usual equiality "==" between HOLFormulas with the syntaxEquals. Otherwise the 
CutRule(...) can not be applied. This happens for first time to me! 
But indeed it is correct in this case. So, syntaxEquality should be 
used everywhere in my oppinion.







git-svn-id: http://gapt.googlecode.com/svn/trunk/source@1307 85d21ef8-add0-11de-ae77-5bfb9c5a3f34
remvoed vim symlink
11 23
Revert "Fix definitional issue in aggregation loop: should loop while < aggregationLevel, not while < aggregationLevel - 1"

The right way to fix this is a gepo property change to increase the max aggregation level, not changing the loop.

This reverts commit dc15930b3d4f9c1a17a00176894d4623e31928e9.
Added misc directory...
Sort the simulation names
remove audio link
remove audio
fix the loop issue that caused the this.loadNext to repeat itself
help message changes + small CSS tweak
updated to version 0.1.5
updated makefile to not create the .zip file
+ info cmd; [nap.bash] + nap_showcfg

Signed-off-by: Felix C. Stegerman <flx@obfusk.net>
Updating podium_config
removes deprecation
Minimize IM intrusiveness for associations.

This comes at the expense of having to do a SQL query even when the
entity being looked up is in the IM. This shouldn't be a problem since
we can rely on the query cache.
2012-11-16--11-40-08
2012-10-26--16-57-53
Remove duplicate icon tv5fi.png, use kanal5.png instead
Merge pull request #70 from tjormola/tj/tv5finland

Remove duplicate icon tv5fi.png, use kanal5.png instead
modularized a bit; output json (as a debug aid yet)
It seems Ubuntu 12.10 has a slight offset to what I found in SVN. This needs further attention, this works now with Ubuntu's libpolarssl
FIX: Wrong name for UnicodeMapper in charmap
FIX: Had forgotten to upload file in remote deploy
Pluses fixed
Use more idiomatic expressions.
whyrun changes to FAC for windows
knife CSD version must be accessible to knife CSI
better memory error handling
Fix bug when updating elo history
Merge branch 'master' into websocket

* master:
  Fix bug when updating elo history
Simplify player count
location for creating resources were not correct for all cases.
different color for ratio stat
reverting failed Markdown :|
Added support for vcr so that tests that interact with FedEx API are only slow one time.
renamed fedex_spec to spec/lib/fedex/shipment_spec
Namespaced shipment spec inside Fedex module.
Removed instance variables in favour of rspec's let syntax.
Creating array with values already in it rather than appending later.
Move request code into separate model so it can be reused later.
Added credentials object to make fedex credentials easier to pass around.
Added Fedex::Helpers and moved all helper methods into it.
Removed constants from Shipment that belong in Request.
Added strong dependency requirements to each class rather than automatically requiring everything.
Made confusing ternary a less confusing conditional.
Moved request -> request/base.
Created Fedex::Request::Base and Fedex::Request::Rate so that later we can have Fedex::Request::Ship for example.
Added support for FedEx shipping labels using the 'ship' Web Service.
Documented modifications to library and new features.
Documented in code and refactored to override minimal methods in subclasses of Fedex::Request::Base.
Update Readme.md
Tidied up Readme, added note about single packages when printing labels and added syntax highlighting.
Added Slide Creation Function Test, background image generation test, ZOrder Test
В импорт должны попадать еще и внешние функции
version -> 0.0.20-2
- added reload timer, thanks to Wojciech Mikołajewicz and Adrian Kajda
Added lots of exercises
initial redis store. Not fully integrated yet with the rest of app.
redis store works with clients, tokens and users
Log for 164 succeeded and 20 failed for the last updated solution.
Fix wxscintilla.vcxproj.
First attempt to fix stc wx_vc11_stc.vcxproj.
logs/10dev_176succeeded_8failed.txt
Add the wx_vc11_core.vcxproj.filters.
Show points on average line if not showing data points
renamed gem to chef, because of dependencies in test suite
Changed fillNeighbors due to sync errors
Added support for column description, DictCursor and TriggerCursors.
Improving API (2)
Updated CreateNewReservationController and created CreateNewReservationView
added returns of move lists
Rename project to jippy
Basic setup
(Test) JVM installation
[ticket/10906] Add setting for last post topic title in schema_data.sql

PHPBB3-10906
Merge pull request #815 from imkingdavid/ticket/10906

[ticket/10906] Add setting for last post topic title in schema_data.sql
[ticket/10561] Casted $config['default_style'] to int

PHPBB3-10561
[ticket/10561] Added function desc for phpbb_style_is_active()

PHPBB3-10561
[ticket/10561] Changed $temp_style_id to $style_id

PHPBB3-10561
[ticket/10561] Removed extra tabs, changes made to $db->sql_query()

Substituted $db->sql_query() with _sql()

PHPBB3-10561
Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympus

* sadu/ticket/10561:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).
Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10561] Removed extra tabs, changes made to $db->sql_query()
  [ticket/10561] Changed $temp_style_id to $style_id
  [ticket/10561] Added function desc for phpbb_style_is_active()
  [ticket/10561] Casted $config['default_style'] to int
  [ticket/10561] Reverted to phpbb_style_is_active()
  [ticket/10561] Added to database_update:database_update_info()
  [ticket/10561] Added section in database_update.php
  [ticket/10561] Moved and renamed the funtion validate_style().
  [ticket/10561] Fixed syntax error and renamed return variables.
  [ticket/10561] Changes made to $db->sql_fetchrow().
  [ticket/10561] Changes made to function phpbb_style_is_active().
  [ticket/10561] All users can choose deactivated styles (fixed).

Conflicts:
	phpBB/install/database_update.php
Update guide/kohana/files/i18n.md
moved from vu to vanderbilt namespace
produto com galeria
link para produto no menu
add products and related galleries
pvr: reenable teletext and subtitles
added logging to javascript console

Added a function so you can log to the javascript console. To view this
console, in chrome: view > development > javascript console (ctrl + alt
+ j)

also added a line that shows a message if the function can't find any
properties to trace.
update, cleaning sources and adding folders
No drafts
Разработка интерфейса для оставшихся классов.
examples revised
improve scripting (active time step)
Merge branch 'coupling' of github.com:hpfem/agros2d into coupling
improved scripting (adaptivity steps, solution type, scene)
Merge remote-tracking branch 'kus/coupling' into coupling
small improve on scripting
Merge remote-tracking branch 'mach/coupling' into coupling
revised pyviewconfig
fixed script connection with gui
revised pyviewmesh
revised pyviewpost2d
Merge remote-tracking branch 'mach/coupling' into coupling
nonlinearity - first step
progress on nonlinearities (scalar filter, local value, surface and volume integral work)
Merge remote-tracking branch 'kus/coupling' into coupling
minor fix (general weakforms still missing)
general nonlinearities in weak forms
improved nonlinearities
progress on nonlinearities
added heat transfer planar steadystate test (intepreted forms)
improved nonlinear dialog
Updating some gems for Firefox 11
Conflict resolution.
minor changes
first draft version is ready
class level window
Added manpages for mailnag(1) and mailnag_config(1)
Update README.md with Debian/Ubuntu package install instructions
Merge pull request #49 from Vincent-C/master

Add manual pages and update readme file
Reversing the polarity of dependency compensation to account for variances in high availability.
fourth time's the charm? - thanks to Han Genuit for the tip
More color on README
Remove tabs and typo fix.
Merge pull request #2 from LTe/readme_color

Readme color
Duh, missing require'
modified to use constaints for pin declarations
Second ruby homework
Wordcount: possession.scriv
- Content                   4589
- Synopsis                     7
- Notes                       45
- All                       4641
Wordcount: fairiesinthegarden.scriv
- Content                  39766
- Synopsis                     0
- Notes                        0
- All                      39766
Wordcount: kobosChronicles.scriv
- Content                  53276
- Synopsis                     0
- Notes                        0
- All                      53276
Wordcount: fiction/Ameli.scriv
- Content                 104717
- Synopsis                  1500
- Notes                        0
- All                     106217
Wordcount: timelines.scriv
- Content                    510
- Synopsis                     0
- Notes                        0
- All                        510
Wordcount: weddingPlans.scriv
- Content                   2197
- Synopsis                     0
- Notes                        0
- All                       2197
Wordcount: newStories.scriv
- Content                    286
- Synopsis                     0
- Notes                        0
- All                        286
Wordcount: ddKick.scriv
- Content                   9758
- Synopsis                     0
- Notes                        0
- All                       9758
Wordcount: K01_June12.scriv
- Content                  59864 (+32)
- Synopsis                    82
- Notes                        0
- All                      59946 (+32)
Wordcount: hip_final.scriv
- Content                      0
- Synopsis                     0
- Notes                        0
- All                          0
Current weather for Portland is Mostly Cloudy (62F/17C) Humidity: 46%
Wordcount: possession.scriv
- Content                   4589
- Synopsis                     7
- Notes                       45
- All                       4641
Wordcount: fairiesinthegarden.scriv
- Content                  39766
- Synopsis                     0
- Notes                        0
- All                      39766
Wordcount: kobosChronicles.scriv
- Content                  53276
- Synopsis                     0
- Notes                        0
- All                      53276
Wordcount: fiction/Ameli.scriv
- Content                 111413 (+41)
- Synopsis                  1500
- Notes                        0
- All                     112913 (+41)
Wordcount: timelines.scriv
- Content                    510
- Synopsis                     0
- Notes                        0
- All                        510
Wordcount: weddingPlans.scriv
- Content                   2197
- Synopsis                     0
- Notes                        0
- All                       2197
Wordcount: newStories.scriv
- Content                    286
- Synopsis                     0
- Notes                        0
- All                        286
Wordcount: ddKick.scriv
- Content                   9758
- Synopsis                     0
- Notes                        0
- All                       9758
Wordcount: K01_June12.scriv
- Content                  91876
- Synopsis                    82
- Notes                        0
- All                      91958
Wordcount: hip_final.scriv
- Content                      0
- Synopsis                     0
- Notes                        0
- All                          0
Current weather for Portland is Partly Cloudy (86F/30C) Humidity: 37%
Convert coffeescript/jasmine approach to use rack asset compiler instead of guard
deps/render/jpge, added new tiny lib
render/mesh/md5, removed ARB
render/mesh/md5b, removed ARB
render/mesh, proposal added ; wasting my time still, sigh
time/dt, fixed compiler issue
time/now, single lib now
Sig verifiying stuff

Now adding version numbers to downloads.  Now downloading into an unverified dir (at the same base directory).  Will mv the files or possibly ln them to the expected location upon a successful verification.
agents: monitoring: remove = signs in usage

long args don't have equals, don't tell users to use them
Merge pull request #65 from racker/remove-equal-signs-in-usage

agents: monitoring: remove = signs in usage
make state machine more consistent. refactor.
set defaultColors differently
Merge branch '256_color'
remove comments. readme.
always show cursor after switching screen buffers.
hide h1 and #help on lights out
handle OSC title code
refactor eraseLine. refactor getRows. optimize.
refactor getRows. ignore DCS, APC, PM. fix broken bold.
refactor csi codes. remove unused variables.
small changes
v0.2.5
fix inverse colors
fix inverse. log and error functions. fix title setting.
optimize character creation.
fix regression involving getRows/updateRange. refactor.
refactor scrollBottom and cols checks
remove comments
refactor key events
refactor. rename variables, functions.
[TASK] Minor updates
Add 'mozallowfullscreen=true' attribute to browser iframes.
[bug 796228] Feedback application r=me
Merge branch 'new-input-visuals' of https://github.com/rnowm/gaia into new-input-visuals
added new case: when form goes after a header.

We need to use the class "full" again.
fixed clear icon and placeholder
Fix media query for when keyboard shown, closes bug 796186
added new case: when form goes after a header.

We need to use the class "full" again.
fixed clear icon and placeholder
Merge branch 'new-input-visuals' of https://github.com/rnowm/gaia into new-input-visuals
Bug 798751 - Data usage meter and widget in Cost Control application
Bug 798832 - Use sendMMI and cancelMMI as changed in bug 793186
[WiFi] Use oninput instead of onchange for PIN input event
Merge remote-tracking branch 'upstream/master' into new-input-visuals
Bug 799037 - basic integration tests for calendar.
Wi-Fi authentication -- CSS fix
Bug 797281 - only allow one device can be connected (Handsfree) at a time
also remove hackForTest because platform offered a onadapteradded hook.
Stop discovery when the user decides to pair or connect
[email] lint
Merge remote-tracking branch 'upstream/master' into new-input-visuals
removed shadow under header´s search box
Merge pull request #5698 from willyaranda/bug798832

Bug 798832 - Use sendMMI and cancelMMI as changed in bug 793186 r=etiennesegonzac
Adds #inside example to readme
Adds code climate link to readme
eliminate DB_Seminar, re #483

git-svn-id: svn://develop.studip.de/studip/trunk@23247 c5b85792-5220-0410-ad23-ed5b6b8ad999
make git version cleaner for untagged repositories
Board and AbstractBoard javadocs are almost done.
initial checkin
fix readme
No need for lambda.
In contentObjectToHtml, show FinalBlockID.
add aliases to node attribute functions to match role/environment
Selenium upgraded to 2.24.1
bagfiksz
20121114
folder creation
scorched: improve antialiasing
scorched: add help text
nacl: add load progress indicator
nacl: prepopulate status div
nacl: center, add border and shadow
nacl: add a menu bar
nacl: create an empty help screen
nacl: support loading local files
nacl: retrieve initial script over http
nacl: fix autofocus of embed element
nacl: dont create recursive examples symlinks
Fix compilation on non-BSD systems. Fixes issue #47 and issue #44.
is_number() is actually exactly like isdigit(). BSD isnumer() instead may return true for dot or command and is nonstandard, so no need to used it at all.
Merge pull request #38 from rlane/scorched

Scorched Earth clone
Merge pull request #41 from rlane/nacl

add contrib directory for Google Native Client
Merge pull request #42 from rlane/setup-errors

catch errors in setup()
posibilidad de controlar 8 o 12 estados
diferentes matrices dependiendo la cantidad de estados a controlar
Merge branch 'master' of github.com:rlrosa/uquad
borro matrices viejas
Update pep-04tz.txt

Adding what I believe, was a missing word: 'handle'
Shuffle modelviewer widgets a bit so it works with a 640x480 minimum size

No idea what a more fluid layout would require (not very important either)
Start checking animation definition
Create an animation definition
First attempt at splitting animation
Move modelviewer log output to top of the screen
"toaster" test model w/ animation
Timing stupidity and only evaluate active animations

If two animations affect the same node and the other one is stopped, that would be problematic
Move the .model parser into its own file

I guess I expected it to be smaller since it wasn't done from the start
Merge branch 'master' into new-ui
Moved XML data outside of source/ because it's not part of the software source code.
Remove V8_DEPRECATED for some operations.
Added top for challenges [Challenges Won, Won percentage, Challenges Lost]
[challenge top] Fixed typos
[challenge top] Fixed other typos
Merge pull request #145 from ciprianf/top_challenge

Added top for challenges
[workshop] Prettify some frontend views.
[magic] Fix #80
Test downloading binary bundles
Moving non-code assets somewhere else
HW1: Matplotlib, Plots, Figure Recreation, Brushing
LU-2156 misc: too noisy messages are suppressed

- number of messages leading to confusion and adding no
  useful information to the customers are suppressed.

- remove KEY_REVIMP_UPD - it's not used with OFD

Signed-off-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Change-Id: I9679b786354a2f4b52c5c13e0e2ec98a5a5b86a9
Reviewed-on: http://review.whamcloud.com/4261
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Mike Pershin <tappro@whamcloud.com>
Reviewed-by: Prakash Surya <surya1@llnl.gov>
Minor errors. Needed to update for new vsip_sqrt_f function. Update to correct norm2
to use normFro (instead of frobenius) for singular value computation limit estimate
Rename loadlua.lua to more logical loadprog.lua, and add zee.lua to BUILT_SOURCES
Distribute emacs_bindings.lua
add map side, to be used soon, and fix releasing
重构参数和命名
Orient configuration around feature instead of command. [major]
Change RC.setup to define config procedure.
The reap tool was renamed to fire. [admin]
Set norc=true for Travis CI. [test]
Techincally they are strings. [admin]
Add profile script for QED. [test]
Update README to reflect changes. [doc]
Add example of consideration of constant based design. [admin]
BFS instead of DFS for search; removing old code.

Using a BFS instead of a DFS for the search.  This will yield 'higher'
results in the tree first.

Removed the old listing code which has been replaced with
npm.commands.ls.
remove the sily -k advice
Replaced os.link with shutil.copy2 for use in Windows
Merge remote-tracking branch 'sean/master'
moving ATtiny85 programmer
td slice proposal constuctor was calling calc_pdf before pdf, S, and D matrices were initialized.
add option restore=

Signed-off-by: alexander barakin (aka sash-kan) <alex@barak.in>
Chapter 9 Tutorial
Make backspace work in vim
added support to listen on USB
added support to listen on TCP (default port 5555)
added support to get the information that should be included in a bug
report
added support to list PIDs of processes hosting a JDWP transport
added support to view device log
added support to run emulator console command
added support to connect to a device via TCP/IP
added support to disconnect from a TCP/IP device
added support to sync a directory from host to device
added support to forward socket connections
added support to uninstall app packages from the device
added support to push a package file to the device and install it
added support to run PPP over USB
added support to get PyADB module version
added support to verify ADB path
added support to find binary files on the device
Fix env variable tests with new Win32 path rules

The new Win32 global path search was not working with the
environment variable tests.  But when I fixed the test, the new
codes use of getenv() was causing more failures (presumably because
of caching on Windows ???).  This fixes the global file lookup to
always go directly to the Win32 API in a predictable way.
Use standard CMake variable names for installation paths

Rename INSTALL_INC and INSTALL_BIN to INCLUDE_INSTALL_DIR and
BIN_INSTALL_DIR, which are more commonly used. This is also
consistent with the variable for the library path which is
already LIB_INSTALL_DIR.
Let environment CFLAGS override the debug flags
Remove backwards compatibility for INSTALL_LIB
Merge pull request #1003 from arrbee/fix-test-core-env

Fix env variable tests with new Win32 path rules
Merge pull request #1001 from veeti/build-fixes

Changes to CMake for packaging
Now writes material attrs to hdf5 file.
Rexports
added setup file
Merge pull request #66 from deian/cleanup

Rexports
JPI - [Task #Archi] - Classe d'accès à la BD
Creating site for escalate.sdt.core, 0.0.1-SNAPSHOT
adding list to array
Add GImport extension note
gui demo : put js and css to separate files + polished UI
Merge branch 'master' of github.com:sebpiq/WebPd
simplified sound-check demo and added more info on how to load a patch in README
blahfasel
update
merge
New airbrake + update rails
CwtCsvNS moved to separate project cwt-csv.
updating allocators
Fix regexp check to match '^$'

When ./check_resmon_metric -H myhost -M Core::Fmadm -C failures -m resources -r '^$'
Use of uninitialized value $value in pattern match (m//) at /etc/nagios3/CS.conf.d/check_resmon_metric line 378.
Use of uninitialized value $value in concatenation (.) or string at /etc/nagios3/CS.conf.d/check_resmon_metric line 383.
OK: resources -
To avoid false critical status check if $value is not defined and if so define as empty string
Minor change
Use `EventStore` to persist domain events

Add a simple wrapper that wraps `SimpleCQRS.EventStore` to Oliver's `EventStore`.
Minor refactoring
Merge branch 'eventstore'
Merge branch 'master' of https://github.com/andreasgal/B2G into skyrocket
Fix incorrect path name
Statement#to_jsonをlikesに対応
イイネをAjax化 #25

* ボタンの切り替えはあらかじめ両方用意しておいてCSSで表示/非表示
* ボタン押下後、当該StatementをJSONでGET、イイネの状況を書き換え
イイネの書き換えが見えるのを抑制 #25
サイドバーに未認証ユーザーは表示させない #53
Add recipe for mark-multiple
Added support for decoding DANE/TLSA records.
Updated contact form
Better spacing, and larger font size on home and portfolio
Break config into multi manifests
gettransaction RPC for non-wallet transactions

Works for wallet transactions, memory-pool transaction and block chain
transactions.

Available for all:
 * txid
 * version
 * locktime
 * size
 * coinbase/inputs/outputs
 * confirmations

Available only for wallet transactions:
 * amount
 * fee
 * details
 * blockindex

Available for wallet transactions and block chain transactions:
 * blockhash
 * time
Use VirtualByteStrings in OS.oz + code improvements.
bugs
errors with spead macros
bug fixes
merge field
feature rule and form field
merge feature change
input merge_with name
merge form fixes
merge form improvements and initial merge controler
dodanie love i unlove
updated built ins
removing dead files.
adding in hog test files.
adding more test files.
Merge branch 'master' of github.com:smessing/Hog
updating numbers.txt, removing a lot of it.
combsimp: remove sorting of differences2
Add LA_RACHE corporate logos
Remove getName in favour of getPlayerName.
Update vim plugins: fugitive, gist, neocomplcache, syntastic, tagbar, tlib
settings for virtualenv
bind 'q' to 'push-line'
no need
ignore pycache folders
Completed longestZigZag. O(n) DP solution.
Merge pull request #13 from sreese25/master

esc key returns to main menu
Level starts over and zombies are created with enter pressed
Merge pull request #7 from sross07/develop

test
Merge pull request #8 from sross07/master

test
Adding hadoop kill job alias
[doc] added deps
added imagezoom
Added new path for melody notes in Hot to Trot 135 bpm: order (G, C, Eb)
Updates commets to reflect the code
UI changes

Altered the response of the Osc CV input knob to feel more natural.
Extended the time segments of the ADSR.
Parser renamed to ClassicParser
tests updated, multiple TLV in one string added.
test renamed
Add initial packaging information.
Add an initial version of the Verse AST.

* Currently, the AST only contains paragraphs (vanilla blocks) and
  content (vanilla inline) elements.
initial commit
Merge https://github.com/tangw/Census
chapter 9 - exercise 8
Makefile for exercise 8
Add amazon support to the cookbook metadata
move get_seq.rb
updated opencl machine interface
Besprechungsprotokoll added
stop triggering lifebonus and timebonus tween if lost
Merge branch 'dev' of https://github.com/thebluber/S3 into dev
difftool: print list of valid tools with '--tool-help'

Since bc7a96a (mergetool--lib: Refactor tools into separate files,
2011-08-18), it is possible to add a new diff tool by creating a simple
script in the '$(git --exec-path)/mergetools' directory.  Updating the
difftool help text is still a manual process, and the documentation can
easily go out of sync.

This commit teaches difftool the '--tool-help' option, which:
  - Reads the list of valid tools from 'mergetools/*'
  - Determines which of them are actually installed
  - Determines which are capable of diffing (i.e. not just a merge tool)
  - Prints the resulting list for the user

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
mergetools: split config files for vim and gvim

In ae69fd0 (mergetool-lib: combine vimdiff and gvimdiff run blocks),
the config files for these two tools were combined since they were
nearly identical.  This remains true, but having a single config
file for both makes it difficult to test that each is installed
and capable of running.

This commit splits the two config files. Now 'vim' and 'gvim'
follow the pattern used by all the other diff/merge tools:
  - There is a single file per tool
  - To use the tool, 'diff.tool' (or other similar option) may be
    set to the exact name of the file.

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
mergetools: fail if display needed but not present

Prior to this commit, if 'git mergetool' or 'git difftool' were run in a
terminal-only session, they might still try to open a tool that required
a windowed environment.

This commit teaches 'git-mergetool--lib.sh' to test for the presence of
a display prior to opening tools that require one.

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
todo: subtracao(). mentalizei alguns casos, falta o algoritimo
Adding more tests in cache_model spec
Specs now passing
Optimized #matching
Benchmark changes
Removed few methods, going to redo a lot.
Add Hacker News and writeup links to Firehearts' section of the README
add provide, autoload, commentary and fix summary line
Merge pull request #1 from tarsius/master

add provide, autoload, commentary and fix summary line
initial depends
initial raspberry support commit
remove invalide glEnable(GL_TEXTURE_2D)/glDisable(GL_TEXTURE_2D) and add GL_EXT_texture_format_BGRA8888
[bcm] fixed runtime assert crash, it helps when width and height are not set to zero
[bcm] only init dispmanx once
[gles] HAS_GLES needs to be set to 2
[gles] without the right shader glVertexAttribPointer will fail
[gles] read display size
[gles] refactor vendor init/setup code to keep WinBindingEGL clean, break out later into a vendor class later
[gles] clean up egl configAttrs
cosmetics
remove unrelated files
[gles] fix error 1281 on shaders

we have shaders where we can't get colLoc. just does not exist in the
shader. not shure if this aproach to fix it is correct.
[gles] changed use GLint and check for >= 0 as sugested by davilla
Merge remote-tracking branch 'upstream/master'

Conflicts:
	xbmc/visualizations/OpenGLSpectrum/Makefile.in
	xbmc/visualizations/WaveForm/Makefile.in
[rbp] rename tools/bcm -> tools/rbp
[gles] add back missing functions
[omx] refactor for other flavors of OpenMax
[omx] refactor test for OpenMax Libs
[omx] cleanup include mess
added package and added some commands for haskell mode.
added match paren keybindings.
Try running universe test with gracket on DrDr.

Maybe serialization on the display will cause it to stop failing.
track import "shapes" as procedure or structure type

Shape information allows the linker to check the importing
module's compile-time expectation against the run-time
value of its imports. The JIT, in turn, can rely on that
checking to better inline structure-type predicates, etc.,
and to more directy call JIT-generated code across
module boundaries.

In addition to checking the "shape" of an import, the import's
JITted vs. non-JITted state must be consistent. To prevent shifts
in JIT state, the `eval-jit-enabled' parameter is now restricted
in its effect to top-level bindings.
fix thread-swap callbacks
fix problems with `would-be-future'
fix problem with compiler's cross-module shape tracking
changed the colorer so that it doesn't use a co-routine; instead,
refactor it so it doesn't add anything to the continuation ever, and
just check if it has been a while since we started (giving other
events a chance to run, if so). Also, interleave the calls to
change-style with the parsing of the buffer to get a more accurate
count of the time the colorer is taking
New Racket version 5.3.1.4.
fix a bug in `free-identifier=?'

The bug is related to macro-introduced `require' and rename on
export.
fix a bug in the colorer refactoring

As it turns out, changing the color (via change-style) can somtimes
split snips, which can change the revision number, which means that
the open port into the editor is no longer valid.

Since this doesn't seem to happen very much when editing in DrRacket,
we just detect this situation and give up on this colorer's port, and
hopefully it actually doesn't happen much (the place it happened that
let me notice this was when inserting an image via a menu in the
drracket test suites)
add docs for get-spell-check-strings and set-spell-check-strings
add logging to the colorer
fix error-message code

Closes PR 13222
basic history, please merge
Adding an example for equal<%>
streamline the objects that are sent across the channel from
the expansion place to the main drracket place during
online check syntax
fix typesetting of builtin non-terminals
Correct TR types for udp-bind! and udp-connect!.
Do not reorder CPat clauses ahead of others in match, to help TR get types right
implmented passive receive timeout
exploit
exploit
firewall
Merge branch 'feature/10_wirusy' of github.com:torgiren/IPS into feature/10_wirusy
wstępny opis
Merge branch 'feature/10_wirusy' of ssh://github.com/torgiren/IPS into feature/10_wirusy
closes #10. Wirusy
Merge branch 'feature/10_wirusy' into develop
Første skud på Yderregister parser
Merge branch 'develop' of github.com:trifork/sdm2 into develop
doseringimporter kan indtil videre ikke pushes til github, så lad os ikke chekke det ud - endnu
Flyttet parent inkl. environment til https://github.com/trifork/sdm4-parent
adding remote image service
[HBASE-6741] [0.89-fb] Detect duplicate assignments more accurately.

Author: aaiyer

Summary:
We have seen cases where multiple notifications from ZK about a
region being OPENED at a particular RS, results in the master
believing that the region is duplicately assigned -- even though
both the notifications mention the same RS (in the data).

There are two ways to fix this:
 - detect and fix why we are seeing multiple notifications, and/or
 - fix the duplicate assignment logic to handle multiple notifications
 from the same server.

 This diff does the latter. Whenever a region is opened, we cache the location
of where the region is opened. If we get a second notification for region
being opened at the same server, then we will not consider it to be a
duplicate notification.

Test Plan:
Add a test using injection handler framework to duplicate the
region opened events.

Reviewers: kannan, kranganathan, mbautin

Reviewed By: mbautin

CC: hbase-eng@, pkhemani

Differential Revision: https://phabricator.fb.com/D565749

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.89-fb@1382294 13f79535-47bb-0310-9956-ffa450edef68
HBASE-6567 make memory locking configuration of regioservers more flexible; INCOMPLETE APPLICATION

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1374848 13f79535-47bb-0310-9956-ffa450edef68
HBASE-6414 Remove the WritableRpcEngine & associated Invocation classes

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1374860 13f79535-47bb-0310-9956-ffa450edef68
include <unistd.h> so we have "::close" defined
JenkinsMonitor tests
ignore packages dir
try std::atomic
rest-client -> httparty
Filter region (manually reverted)
Create a filter region that is big enough to make filters visible that overflow the original bounding box.
Move utility-code into src/util/

The idea is to make it absolutely clear what the core of spew is.
Update WIP
Added code to restart game after goal

// 0: Clean timer and keyboard event handler
// 1: display a message and update score
// 2: reset players and ball position
// 3: the player who scored send a message to the server to notify the
new score. The server replies with the new ball direction to both
players

The problem is that after the game restarts, the ball is now faster and
moves like crazy!
made projects only  visible to users with permission to see them
Fixed whitespace (please don't use tabs)
Fixed memory leak on symlink
Merge pull request #61 from hintjens/master

Whitespace cleanups
Install include files into main directory
Added listener/sender example
Whitespace cleanups
Was receiving from socket instead of object
Formatting changes brought over from FileMQ
Merge pull request #62 from hintjens/master

Fixed delivery reports
Revert "Fix for filename<>virtual mismatch in filemq handling"

This reverts commit cf12437e2c7c611bde94d2ed716c1f8fd2ec9625.
Merge branch 'pieter' into victor

Conflicts:
	C/src/zre_udp.c
validate for register form
improve form for channel and category
Update php/.gitignore
*** Incompatible Change *** Remove PhysicalSystem property from ObservableSet interface and change argument of observe() method. PhysicalSystem object to calculate observable value is passed as the first argument of observe() method.
impl gl matrix ortho
meta tag para manter zoom correto
lista dos palestrantes com foto nos detalhes
ajuste na formatação da descrição da palestra
detalhe com a lista das pessoas que vão à palestra
click no botão para abrir e fechar a aba com a lista dos participantes
atualização do icone da agenda
Added new bug to TODO
patch: disable fix if it is a merged patch

Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com>
bump version
Merge branch 'catkin'
Imported Upstream version 0.10.2001940
Merge tag 'upstream/0.10.2001940'

Upstream version 0.10.2001940
+ Creating debian mods for distro: precise, rosdistro: fuerte, upstream version: 0.10.2001940
+ Creating debian mods for distro: oneiric, rosdistro: fuerte, upstream version: 0.10.2001940
+ Creating debian mods for distro: lucid, rosdistro: fuerte, upstream version: 0.10.2001940
still 4 test
sub: enable sub-pos with libass

The --sub-pos option and sub-pos property control the vertical position
of a subtitle.

Also change how sub-pos is handled in the old subtitle renderer (used
with -no-ass). The new behavior doesn't render subtitles out of the
screen if the subtitle is located near the top screen border and has
too many lines.
sub: add --ass-style-override option to disable style overrides

There are a number of options which modify ASS subtitle rendering. Most
of these do things that can interfere with the styling done by subtitle
scripts, resulting in incorrect rendering. Add the --ass-style-override
option to make it easy to disable all overrides. This helps trouble-
shooting, and makes it more practical to use the override features. (You
can simply toggle the ass-style-override property at runtime, should
one of the style override options break subtitle rendering at a certain
point.)

This mainly affects whether most --ass-* options are applied, as well
as --sub-pos. Some things, like explicit style overrides loaded with
--ass-force-style, can't be changed at runtime using the
ass-style-override property.
commands: add print_text input command to print text on the terminal

In theory, this could take over the role of the get_property slave
command, and is more general.
_EXECUTED_SCRIPT_DIR_ -> _SCRIPT_DIR_
added cfityk.py, equivalent of cfityk in Python
Version to 1.15.2-SNAPSHOT
Stop using DataTransferer (bug #559)
Stop using XMLGregorianCalendarImpl (bug #559)
Get rid of some maven warnings (bug #559)
Merge branch 'develop' of https://github.com/joelkuiper/addis into develop

Conflicts:
	application/src/main/java/org/drugis/addis/entities/analysis/NetworkMetaAnalysis.java
Additional architecture documentation
Extract architecture docs to LaTeX
Improved XML diagram
Fix references to GeMTC (story #546, #545)
Move more code to GeMTC and common (story #545)
Merge branch 'develop' of https://github.com/gertvv/addis into develop

Conflicts:
	application/src/main/java/org/drugis/addis/gui/wizard/SelectStudiesWizardStep.java
Reorganize MetaAnalysis wizards (story #538)

  * Rename s/SelectedStudyGraph/OverviewGraph/
  * Rename s/StudyGraph/TreatmentDefinitionsGraph/
  * Stop calling things Drugs if they are not Drugs.
  * Consistently distinguish "raw" and "refined" selections
  * Fix, reorder, rename and document NetworkMetaAnalysisWizardPMTest
  * Move some code around between Abstract~ and Network~.
  * Remove unused and/or nonsensical methods
  * Refactor ComboBox in RefineDrugSelectionWizardStep, add FIXME to use
    ObservableList
  * Add note that testRawSelectionCompleteModel is probably slightly incorrect
  * Define next test to write
profile just for esrc load
change CGUIControl::GetNextAction to more general CGUIControl::GetNavigationAction
don't continue to follow navigation path if we don't have valid id of next control
split GUIAction::Execute into GUIAction::ExecuteActions and CGUIControl::Navigate
GUIAction::ExecuteActions will simply execute all non-navigation actions
CGUIControl::Navigate is meant to start navigation from control in given direction until we find focusable control (executing actions on its path)
[Python] add "sorttitle" to listitem.setInfo() and the sort method SORT_METHOD_VIDEO_SORT_TITLE

useful for proper sorting by title when you highlight search results with [COLOR blue] so the [ does not affect sorting.
DVDVideoCodecFFmpeg.cpp: Match the error log with the function called.
AvFilter wrapper: Remove unused avfilter_poll_frame which has been removed in libavfilter 3.
AvFilter wrapper: Remove unused avfilter_request_frame mapping as the function has been removed in libavfilter 3.
AvFilter wrapper: Remove unused avfilter_get_video_buffer mapping as the function has been removed in libavfilter 3.
AvFilter: Map and use av_buffersrc_add_frame instead of av_vsrc_buffer_add_frame with libavfilter version 3.
jsonrpc: add "value" property to Input.OnInputRequested notification
Return more accurate information about SampleRate
Disable the Windows screensaver normally.

This is the ordinary way applications disable screensavers.  This keeps
XBMC from leaving the screensaver disabled when it doesn't have focus,
which is very important on plasma TVs, and this way is also much simpler.
peripherals: refresh settings on device addition/deletion, peripheral manager could be now enabled/disabled
Merge pull request #1183 from zewt/windows-screensaver-on-focus

[WIN32] Fix the Windows screensaver left disabled when XBMC loses focus.
Music Scanner Bugfix

1. Bugfix: Music scanner did not correctly load the image artwork for directories with more than 1 album (i.e. "Singles" directories).  Now it does.
dirty regions: dont add invalidated, invisible controls to the tracker
threads: fix linux thread prio in case user has no entry in limits.conf
smartplaylist: fix typo in artist rule for albums
[musicscanner] Fix a deadlock for users with NFO_COMBINED or NFO_URL in their artist or album directories.
fixed: too many ALSA audio devices enumerated on Ubuntu

Ubuntu has patched their alsa-lib so that "defaults.namehint.extended"
defaults to "on" instead of upstream "off", causing lots of unwanted
extra devices (many of which are not actually routed properly, like the
"dmix:$foo" ones which may actually direct to a completely different
device) to be found by the enumeration process.

Skip such devices.
queue manger supporting concurrency control in workunit checkout
removed need for c11 c12 c21 c22
todo adjustments, new less files/content
Create Project Android
adding metanifo for singlebit module
Fixed small typo with big effect in xebium formatter
Add example fixed language settings to core configuration
site.pp isn't required until after puppet.update
not paid sms started
Tue Oct 23 00:27:31 JST 2012
price steps finished testing still not done
disabled udp-notifications between auctionserver and bidclient
some RMI communication works - far from perfect
stephan version
Merge branch 'robert'
xbps-create: added -B (--built-with) to set "packaged-with" string obj.
issue #18791: update submodule
Merge pull request #18 from shackbarth/18791

issue #18791: update submodule
Corrected links to Cade Metz's profile on Wired.
code whoops
added some tiny tests to toolbox, cleaned up fileref check
code.pylint - andy can test itself
making pylint a little more chatty
missed a refactoring part
code.pylint skipping todo's and being a little more terse
making andy restart less chatty
modified color-theme-ctm.el
Merge branch 'testing' of https://github.com/yamryo/elisp into testing

Conflicts:
	color-theme-ctm.el
Fixed issue with iScroll instance not removed after destroy and hence not re-initialized;
Fixed issue with jQuery object supplied to scrollTo breaking it;
Added an iscroll_options option for extending defaults
Added a drag_parent option to allow dragging  inside an element while maintaining styles
convert habtm to has_many through
display a basic list of plays in a game
(extremely) basic permissions check for plays
add missing primary key
basic and dirty, but working, lithium template
Merge pull request #17 from romaintb/lithium_templates

basic and dirty, but working, lithium template

closes #2
more cleanings & reordering
bootstrap this bitch
Fix a bug in app discovery
/ ‘awesome/rc.worka.sh’
Test for Node.compareTo().
Merge pull request #1 from yurloc/testNodeCompareTo

Test for Node.compareTo().
Add declaration for an omitted test.
Testing Itinerary.getcurrentArc() and Itinerary.getNextNodeToReach().
Remove debug output.
Test Itinerary.getDistanceTravelled()
Better rounding spec.
Refactor Itinerary.getCurrentlyOccupiedArcs()
Introducting planning entity ItineraryAssignment.
First simple score calculation.
Itinerary.getNextNodeToReach() no longer necessary as we now have
simpler methods to do this.
Significant performance improvements.
added all steps to debug trace
Implement FeatureSteps.before
* ncl-mode.el: easy-menu added
add shortcut for diff
Merge remote branch 'origin/master'
modify: yank, diff, buffer
Rename the template
Pointing README image paths to github pages
Add rvm module
Supporting offsets in mpm_exec.
Remove NODE specific output
Merge branch 'master' of github.com:zhouyan/vSMC
remove timer in CLManager
remove test for examples
do not exclude rng anymore
move function into namespace vSMC
fix and faster try_random
cleanup
added simple union hopstance, fixed 1.8 zhumbugs
Modifies indent and highlighting style.
nice visual updates
remove pymacs
add gitmodules
Add pythonrc with history and completion
Added 0000698 : Draft Extrude
IDE updates only
Fix messy temp_dir import
More test fixes for Jenkins
fix conflicts Merge remote-tracking branch 'origin/master' into vulnerableGroups

Conflicts:
	safe_qgis/dock.py
fix some documentation, remove use of SVN for getting the data
reshowing postprocessors configuration. deals with #365 and closes #383
Added image variants for UB11.04-64
Merge branch 'master' of github.com:AIFDR/inasafe
Updated test image variant for UB11.10-64
temporal solution for #385, but it is not the ideal one
Merge branch 'master', remote-tracking branch 'origin' into printMapWindows
Test fixes
Fix shake event runner
Revert "commented verbose debugging out"

This reverts commit 698cad8eb9f76fe15d27d23ca2ee195c41bbb72e.
Revert "safe/api.py now lint-free"

This reverts commit 5be6848d2112794fdb172eed7a8cff13feb0df12.
Revert "Exception handling"

This reverts commit ea3f389f210317b431aaac9832778e0f037efe8e.
Revert "Work in progress"

This reverts commit 872a17430243a99fd5923c3a7d8c5ab9ea4727d1.
Revert "More Exception handling"

This reverts commit 7d36bc4cc0593fc11fc87da7a653c71355c63e0a.
Revert "Temporarily disabled a pylint check until this can be rewritten"

This reverts commit 60c844db93c88d081f5873c8d799a50c44139618.
Merge branch 'master' of github.com:AIFDR/inasafe
Exposed tolerances used in get_resolution through to Raster.get_data()
move: old template to trash. #16
Build distribution packages in CI (just archives now, not deb/rpm yet).
rien
commit utile, ajout sur la sitac marche presque et plus de demande redoublee dans les moyens
Membergroup Icons - managemembergroups.php

Added checksession()
fix some bugs in css
add preload effect
Add console_log from php
Shaer mifarmayad: Eyval valete vavali be voolet
Dynamic our-customers page (php only)
Fixed: better console logs
typo correction and mdification
[Fix] Windows compliant.
routines integration
Reformatted to work with NetBeans
update SKOS plugin to generate references when no documentation paragraph is provided
ajax added, rake functional error
Major update changing the interface and configuration files
Major change on interface and configuration files
852
Merge branch 'master' of github.com:BR-DESIGN/IAA
upd (pythonize stuff)
annotated
[FIX] Core: reduce number of unnecessary close/quit calls
[MOD] GUI, highlighting/query execution: only parse XQuery files
[FIX] GUI, editor: "find next/previous" shortcuts swapped.
[FIX] GUI, refresh components if text is dropped to text field
[FIX] GUI, allow copy&paste in "find" text field
[MOD] GUI, remove ...dialog.Dialog class to ...layout.BaseXDialog
[ADD] Conversion module: functions for durations added; functions for
      dateTime operations renamed
Finished gold app for storing into local storage
Added style guide to author distibution stuff at the top!
modify:hoxfix add something
modify:iss53 fix prob
Merge branch 'iss53'
modify:iss54 fix test.rb
modify:master fix test.rb
modify:break.py
additional power connector 2.54mm
finished finaly the damn prefecture view and all is here ... HF
Merge branches 'master' and 'tibo'
security and validates on Worlds + some view added on world/show for better look at world subjects and guilds
Merge branches 'master' and 'tibo'
With button?
Added toggle for refund discounts
BUGFIX: $CORE_LOCAL logging broke if log file didn't exist
BUGFIX: Automatic tare from opdata.products interfered with refund flag
BUGFIX: Price override wasn't cancelable
OXM missing fields filled with respective field values
Update implode() method
Add the finish TP2