labofsahil/github-event-dataset-2012 huggingface dataset:
Answer by spelling caller ID.
Fixing silly cut and paste error.
Special handling for Thomas.  Others go to queue 'org_id1'.
infoknop
Merge branch 'master' of https://github.com/ThomasVyncke/Scio.git
Updated to work with current versions of haxe and swfmill. Updated the icon. Merged with a version supporting external interface calls.
Path와 Geometry 463page
Properly track number of students in each exam.

Along with some other small changes in areas.
use Cython to build speedups if it is installed
do not compile speedups with pypy on windows
Require C-continguous and self-owned ndarray data. See GitHub issue 26.
Don't stumble over SVN revision numbers in GEOS C API version strings.
Merge pull request #11 from sgillies/master

Fix for bug reported by tomkralidis
Updated to Bukkit 1.2.4, fixed typo that prevented compilation.
added cdd
added an alias to move up a single directory
merged
Removed tablet to mobile css styles for footer
Added responsive styles for 768px-979px
Added mobile-767px responsive styles; still need to fix bottom 3 sections' margins
Minor header style change
Big Screen responsive styles
Nano responsive initial commit
Asignando valor inversion al Agente
Added some more kludgy fixes for encoding issues.  Should be a bit more stable, but likely imperfect.
Updated Flash version in var/lib/dpkg/status so that dpkg --status browser-plugin-adobe-flash now reports right version
dist-upgrade pulled down some security updates for curl
Open image before `Image.open` call.
Related issue: http://stackoverflow.com/questions/3029988/django-gives-i-o-operation-on-closed-file-error-when-reading-from-a-saved-imag
Typo.
Fixed 'Format' object creation with custom id.
customize listing admin change list page
Merge pull request #127 from miso-belica/master

Fixes for `ella.photos`.
Merge pull request #128 from TomasFlam/admin

customize admin's change list page for listings
Added ListingHandler subclass capable of filtering by authors
AuthorView now properly includes all articles
TODO note in redis cache module
Added missing AuthorView
no more module-level cache that f**ks up tests
Category admin now using multiform
content_type attribute on Publishable should be set to editable=False
Merge branch 'master' into ella
Merge branch 'master' of github.com:ella/ella
fixing tests
python 2.5 has no json
include MEDIA_URL in serialized photo urls
Fixed add/remove exceptions to match current terminology.
Added Instance class (an instance of an application package).
Fixed add/remove exceptions to match current terminology.
Completed basic Instance class and added to Host as a replacement for package.
Added tests for host application instance management.
New LCD library plus -v option for gpio binary
- admin / security actions are now part of SilexCMS
增加dl-ssl，删除market
#21: Finished first port of everything from Aigilas
I think i fixed commits
Added Console Wrapper colors
Fixed bashrc and zshrc for wc. Added ls-- submodule
moved icons into navbar-collapse
reworked routes + sentiment WS + general workflow
Честное клонирование + универсальное наследование
Moves drjava-jenkins.sh to the jenkins-jobs directory
Prompt chnages changes colors on ssh
Adding netty libraries.
Seed.
Http example from netty site.
First cut of a general game framework.
Refactoring of the game framework.
Performance boost.
Replicating hit scenario with dummy objects.
Util class for utility methods.
default ucs4
stylesheet line endings fixed
add passwords controller
add passwords resource to routes
add password reset link to sessions
add new action, form to passwords controller
add create action to passwords controller
add migration for password reset to users table, add token and datetime stamp
add token generation and user mailer call to user model

workaround for password-length check, password attribute is checked only on user creation, encrypted password used afterward
add user mailer
user mailer is done

development environment settings changed to send messages to localhost
password_reset method correctly called from user model
token link is generated
password controller actions done

password reset works, token is invalidated on successful reset
Merge branch 'dash_recommend' of https://github.com/ackermanir/tixbay into fix_cucumbers

Conflicts:
	app/controllers/recommendations_controller.rb
	app/views/recommendations/form.html.erb
cucumber omgah
Merge branch 'dash_recommend' of https://github.com/ackermanir/tixbay into fix_cucumbers

Conflicts:
	app/controllers/recommendations_controller.rb
	features/step_definitions/sign_in_page_steps.rb
Merge branch 'dash_recommend' of https://github.com/ackermanir/tixbay into fix_cucumbers
cucumber arghhh
getting ready to pull from sign in
we don't write bugs
Merge branch 'sign_in' of github.com:ackermanir/tixbay into dash_recommend
we don't write bugs 2
User spec test
Updates acquamanCommon.pri and AMFileLoaderPluginsCommon.pri to use MPlot as a shared library.  Requires pulling the latest MPlot version, and building the MPlotLib.pro project before building AM.
added important dates pdf
Added arglist to doc output.
Implemented POST support in REST client.
Added 'All' checkbox for both the submenus in the config window
add license
Merge branch 'master' of github.com:after12am/glgl.js
Better snapshot naming
Tweaked twitter url
Added different twitter suggestions
Worked on the help us get funding modal
Gallery page
update ST7920 driver
insert coupons data clear
Pages in process
Muchachos les mando el registro de la reunión del viernes 23-11-12... incluye fotografías y el documento... :)
名前は大事なのでちゃんとした
まちがえてた！
pre_filterメソッドの最初のテスト書いた
read-eval blows up if not turned on
Fix typo in function name
Merge pull request #740 from alanpearce/fixes

Fix typo in function name
Add groovy-emacs-mode recipe
Merge pull request #743 from shellbj/groovy-emacs-mode

Add groovy-emacs-mode recipe
Redirected some dead cvs.m17n.org repos to new github repos.

cvs.m17n.org is closed and apel, flim, semi and wanderlust are moved to gith
Here is a discussion about the move:
http://comments.gmane.org/gmane.mail.wanderlust.general/4913
This change follows that.
Merge pull request #744 from omo/cvs-m17n-org-move

Redirected some dead cvs.m17n.org repos to new github repos.
Merge remote-tracking branch 'upstream/master'
Code tidy

- removes unnecessary code (e.g. casts, etc)
- found by enabling various checks in Eclipse compiler settings
Updated deployment plan
Updated seeds to have better email addresses
Added admin@test.com back, probably important to have him.
Added george bush's email address
Merge branch 'drakecb'
Added current add/delete/search functionality to admins.
added basic loading panel
restored id value to course_section (in new course form)
Removed case insensitivity, should be fine.
Signing this release

Still out of practice, (too much C++)
Friday SPX return when mon thru thu were positive
Added microposts and relation with user
started work on the grub fired up 32-bit kernel
added the PORT library from CLOCC because datastore needs it, and I can't find it anywhere online
rename index.html to demo1.html
Implementing more on client
Redmine1.4.x対応の改善(まだ動かない)
Started markup for calendar module.
Created schedule folder.
Replaced the generated stylesheet with sass files.
Don't add a custom class for each artefact
cleanup
Updated acl, Cleaned more up, Fixed database pages
Last activity for users
WTF do all these msgs come from?
WIP jmeterr
Fixed ambient material term in Blender exporter.
Added shell command
Fixed typo
created Pryrc
update the codemirror.css
Bump version.
NIFSKOPE_REVISION change to macro
removed note from config.h and deleted config.h.in
Merge pull request #6 from 'mharj/feature/qmake_macro' into develop

Conflicts:
	config.h
	makeconfig.sh
Remove dead parsing code.
More dead code gone.
Parse arr1 expression.
Fix bug in expression parser: it would not recognize bitwise or '|' as an operator.
Updated evaluator so arr1 can contain arbitrary expressions (required for pyffi compatibility).
Sync to latest xml with pyffi patches.
Set NIFSKOPE_VERSION from VERSION file.
Remove brackets around 'unknown' when revision is unknown (looks better in 'About NifSkope' dialog).
Remove unused @WCREV@ replacements.
Remove wcrev code from makeconfig.sh (it also now no longer needs git).
Also look at BS Properties to get texture property for uv editor.
Also look at BS Properties in glmesh.
Merge pull request #3 from amorilia/feature/arr-expression-parser-upgrade

Array expression parser uses Expression class, instead of old buggy parser.
Fix collada UV export: have to flip second coordinate.
Merge pull request #4 from amorilia/feature/bugfix_for_bsprops_in_uv_editor

Also look at BS Properties to get texture property for uv editor.
Merge pull request #5 from amorilia/feature/collada-uv-fix

Fix collada UV export.
panel-volume: Add logistics to change AudioEngine on runtime
panel-volume: Fix runtime AudioEngine if multiple are available
panel-volume: Fix compilation issue when one of the AudioEngines not
found
panel-volume: remove unused translation file
Merge pull request #421 from amoskvin/master

Make it possible to build modules separately
Merge pull request #418 from nebulon1234/master

Use Alsa and PulseAudio when available
Emit a signal when a module is started/stopped
Add a fallback provider for those without UPower/CK

Closes issue #391
Update README
Make razorqt-autosuspend a module
Fix for "optional debugging when there is RAZOR_DEBUG env.var. set"
Fix autostart dir detection when the env var is set
Do not display blank entries if xfce creates invalid files
Greeter: theme ugly dropdown button
Greeter: Un-hardcode background image
Q is lowercase
razor-config: wrap text

If someone could figure out how to make the text take up the full grid
width...
Replace <p> tag with newlines since it's not valid notification markup
Minor fix for class/struct mismatch
Translators info & refactoring of the About dialog
Fixes layout errors for SimpleTraitView
Vorlesung vom 10.7.12
added prototypes for join, merge and union
Ticket #101 - first pass

- Add `draw time` to debug panel
- Add dirty rects in reverse order (ensures debug panel is drawn last)
- Do not use `drawManage.makeAllDirty()` when `me.sys.dirtyRegion = true`
- Add rectangle information to TMX layers
- Small optimization in `TMXRenderer`
- Support `Infinity` dimensions in `me.Rect`
Ticket #101 - Update debug draw time to record the time between its update and draw methods.
Ticket #101 - Make infinite planes a special case in rectangle geometry

- Infinite planes should be treated as immutable.
Documentation fix
Avoid systematic Function (Object) creation when using the default sorting function (more GBC friendly)
Fix column/row being swapped in `me.Tile` - thanks to Greg Houston
Ticket #111 - added opacity value to SpriteObject
Lowering names for audio files in tutorials.
'Fix' for Issue 109.
Merge pull request #113 from eberan/lowered_audio

Lowering names for audio files in tutorials.
Fixed getOpacity function (ticket #111)
Fix default mouse bind list

- This was defaulting the left mouse button to be bound to keyCode 3.
Ticket #117 - Prevent mouse event conflicts.

- Only preventDefault when a mouse event has been dispatched.
- Only handle mousewheel when event is targeting the canvas.
- Some simple cleanup, including all event handlers returning a boolean.
  * True to indicate the event should be propagated.
  * False when the event has been handled, to indicate no more event propagation is necessary.
input: Remove unnecessary semi-colons from function definitions.
Ticket #117 - Only prevent mouse event propagations into the DOM when a handler explicitly returns false
Updated closure compiler to the last public build

see http://code.google.com/p/closure-compiler/wiki/Releases
This last build also turns on es5 strict checks in VERBOSE mode, which
is interesting.
Ticket #121 - Fix multiple animation frame request callbacks when calling `me.state.change` with a fade.

- Defer the call to _switchState(), because this function is typically called from within the game loop (called by the requstAnimationFrame callback)
Remove unnecessary argument passed to _startRunLoop.
only cache those values if some handlers are defined

avoid any useless declarations is always good :)
Removed the fps value caching (was not really helping with anything)
added some skeleton as a base for the plugin feature
a little of code cleanup
adding tests. modified some crud pages. allow arrays to be returned by tests.
darkened the top navbar
changed the color of the selected navbar item.
removed the text shadow.
Add SHA1 of working weston on Ubuntu 12.04 (94.90)
Many material changes and finalsproject changes.
Merge branch 'master' of github.com:apartridge/Crayon

Conflicts:
	src/finalsproject.cpp
Win8:Forecast: Create and handle in-app purchase
Win8:Forecast: Fix map loading issue
Repository synchronization

-> SID:2962
NOJIRA
Disable LB... need investigation

SID:2963
remove unused/copied test suite Reviewed by : jshiefeer

SID:2966
ActionType (QuotaAction) not implemented
Reviewed by: enars

SID:2967
NOJIRA
Re-Enable tests

SID:2968
NOJIRA
Disable LB... need investigation

SID:2969
Update AIB /Cluster porcess upgrade to merge configuration.properties file  Reviewed by : jsautreau

SID:2970
sanityCheck script don't report good status
reviewed by : rploszajczak

SID:2971
NOJIRA

SID:2975
NOJIRA

SID:2976
NOJIRA

SID:2978
Added translation functions to the visible text strings in the scripts directory
Reviewed by:jsamples

SID:2979
E3 flooded by logs
Reviewed by: rpiro

SID:2982
NOJIRA
Add traces...

SID:2984
Updated translations
Reviewed by:jsamples

SID:2985
Updated french translations
Reviewed by:jsamples

SID:2986
Fixed declaration of translate method in controller files
Reviewed by:jsamples

SID:2987
added some check to CommonApiChecks to validate input xml. Added a control to bundle creation after 2 minutes.
Reviewed by:Julien

SID:2988
Blocked 8888, 8889, 8988, 25100 and 25101 ports in AIB configuration
Reviewed by: mpruszak

SID:2992
Add tooltips to front-end webpages (work-in-progress).
Reviewed by: David Lavo

SID:2994
d3dretrace: Merge d3d9 and d3d10 retracing.
Adding missed modules to package.json
Added support for custom naming which can include sub directories in the destinations.
#9 - Fixed problem where Anvil was trying to blindly 'BUILD ALL THE THINGS' found in any directory it was looking in. It should now only process files it knows how to handle.
Version bump to 0.7.3
Merge pull request #17 from arobson/master

0.7.3
screen capture shadows
optionally use real DLL on Windows
remove path references in any test output
refactor
use real DLL for expected test output on windows
tests: add basic PS-with-UAVs tests, and HBAO CS test
tests: add hull/domain shader test
Fixed null title values breaking xml parser

Another attempt to fix '"title":null' attributes breaking
XmlSimple when converting compute resources from JSON
to XML.
lossy signature developing
cab
Merge branch 'master' of https://github.com/arg3ej/whEElpower
add another mutual information plot, this time for pure lethality selection and limits towards pure lethality selection
Merge pull request #71 from arikon/gh-pages

Increase output buffer of `shmakowiki` call
Beginning (in English) - grammar and style correction
Relocation for one image
Beginning (translation), translated picture
Beginnig (translation), builded html page
Merge pull request #72 from toivonen/gh-pages

Transtalion for a beginning article
Start proofreading the text
More proofreading...
More proofreading...
More proofreading...
Finished first round of proofreading
Build result
Second round of proofreading
More proofreading
Last(?) round of proofreading
Subtle tweaks
Merge pull request #73 from Leonya/gh-pages

First round of proofreading
Merge commit 'bem/gh-pages' into gh-pages
Build result
Merge pull request #74 from toivonen/gh-pages

Nice page (building result)
rimossi file pdf e doc
changes made at the last presentation by arturo

improve refresh rate significantly
<Arun> Added code and unit tests
created modal forms for user
fixing magento.css split.
ui.app: depends on rfc4627_jsonrpc
ui graphs: code style
ui graphs: reenable floater
README: TODO update
Try to execute the querries inside the if statement.
slightly better image positioning
flush ongoing bopomofo support ideas.
Update positioning stage without foremen
Update bonuses config
Add an offset to GameSpawn startPositions
Fix regions sand and gravel falling cancelling
Remove ugly bold formatting in messages
Turn off the annoying close todo file behavior
Add global todo mapping
Added NERDcommenter plugin to vim
KVM Test: subtests.cfg.sample: Split virtio_console into multiple variants

Splits virtio_console test into smaller logical bundles of test variants.

Added variants:
* smoke (should always work)
* basic (should always work)
* performance (needed only for perf regression testing)
* destructive (those are tricky)
* migration (migration-related tests)
* hotplug (hotplug-related tests)

Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
updating fast trigger with an angle condition, if at 90 degrees then the UAV will drop
add cohttp to Makefile
expose Response.read_body_to_string
depend on Async instead of Async_extra (which pull in the rest)
use the clearer `open Async.Std` interface rather than Async_unix or Async_extra directly; suggested by @yminsky
Vim is improved!
add heap test files
added newlines to dist plot titles
Added loadWellmanCsv
Using margDistSCPP rather than on the fly expectation of bids.
initial commit
wrapper for testCompareWellman.py in exe dir so only /bmProjects/exe needs to be added to PATH
strip leading/trailing whitespace of txt file
format the register address
simplify txt2reg program
fix one minor bug of txt2reg.pl
decided to build a cache library and do it TDD from the start
Make it compile with Qt 4.6
FIXED: Regression - Windows did not load SDL.
FIXED: Dragging top scene merged it with other scenes.
FIXED: Dragging last scene deleted it.
Stop faking drag-and-drop for moving scenes.
FIXED: Did not check spelling of pasted paragraphs.
FIXED: Could not interact with dialogs during load.
FIXED: Warned user twice about every malformed file.
Use alerts for warnings when loading files.
Move code for configuring alert into alert class.
Close alert under mouse first.
Base maximum width of alerts on pixel density.
Stop distributing dictionaries on Windows.
FIXED: Theme previews did not show line spacing.
FIXED: Theme previews did not scale tiled or centered images. Closes #49.
FIXED: Did not stop watching files when they were closed.
FIXED: Switching themes still wasn't properly focusing text.
FIXED: Could save over files open on other tabs.
FIXED: Scene list was visually corrupted when footer was shown.
Remove uninstalling dictionary files.
remove requires rm not add on a change in source.
Maybe not, uv generation seems accurate
upload latest changes
Merge branch 'master' of https://github.com/barroyo/medkinect
implemented issue post
Fixed potential crash. Tweaked item consumption

on the upgrade item
Adding NXT Model, Simulator
Adding the Files
branch admin -prepare release priam-complete-1.6
fixed the bug with __set in Response
Updated from Uintah.
Modified from Uithan updated.
externals #3
[code] fixed ball speed increase
finally mask works
ctrl - add signal handle functions and thread exit code

ctrl -
 <1>增加信号处理函数;
 <2>调整往后台发送心跳包的逻辑;

capture_merge -
 <1>增加退出线程的代码;
ctrl - create a thread to feed watch dog

ctrl -
 <1>创建一个线程来执行喂看门狗的动作;
Updated Authenticaton to use Facebook

Removed all the old authenticaiton for users
Added in server side support for Facebook OAuth.
Updated User model to store relevant Facebook data.
Added the Facebook C# SDK

TODO: Massive test update and Test framework support.
Elloyd2: Post Tag Fixes

Update tags to remove all whitespace to make sure we dont end up with
duplicates.
Updated the edit page to correctly handle tags.
Updated Index page to show all posts, even not published if you are an
admin.
Edit view update to match the create page.

TODO: Add in support to directly edit on index page.
Add support for a  label (for elastic search spec)
Fix a bad key when rebalancing on two nodes.
Improve tree dot output.
reload on cancel
.
layout
open feedback by number on page to edit a feedback
First attempt at streaming youtube
mrfast 2.1.0.6

Closes #13882.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mpdas 0.3.0

Closes #13881.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mpc 0.22

Closes #13880.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mp3gain 1.5.2

Closes #13876.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mp3check 0.8.7

url -> google code page

Closes #13875.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
monit 5.4

Closes #13873.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
miniupnpc 1.7.20120714

Closes #13866.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
midgard2 10.05.7.1

Closes #13864.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mathomatic 16.0.1

Closes #13863.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
memcached 1.4.14

Closes #13862.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
memtester 4.3.0

Closes #13861.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
maxima 5.27.0

Closes #13860.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
metaproxy 1.3.38

Closes #13859.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mftrace 1.2.18

Closes #13858.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mikmod 3.2.2

Closes #13857.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
libmikmod 3.2.0

Closes #13856.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
dcmtk: update fails_with to build 421

dcmtk still fails with clang-4.0.421 from XCode-4.4.

Closes #13854.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
privoxy: remove autotools conditional

privoxy uses `autoreconf` for stable and HEAD. Remove the
conditional that added the autotools deps only for HEAD.

Fixes #13867

Closes #13869.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
REPOSITORY not PREFIX when checking for the .git
hiredis: update failing clang build

Fixes #13851.
also exclude rsync'ing .gitmodules

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
create indexes on requests_active and requests_history
Removed bash config files
Category Analyst
updating example of fabric environment
function to download fixtures from the server
new fixtures
delayed_job emailküldésre
tesztelői és howto oldalak, javítások, stb.
kétféle plecsnikép külön kezelése
képkeretezés
láblác, tesztelő badge, pontozás formázása
alter multi-send layout to fit qr scanner mode
Merge branch 'multi-select-send' into merged-2
Added link to movie page and link to tweet about the movie.
Updated ic_launcher to represent app icon.
lir.cfg: Set output separator.
*.cfg: Drop single quotes where not required.
lib/lingo/attendee/tokenizer.rb (tokenize): [MINOR] Use "last match" variable instead of indexing into MatchData.
v1.8.2
I now have connections not blowing up ^_^
updated readme.txt
Merge branch 'develop'
Got the HTMLReportWindow working...
Working on renaming HTMLReportDialog references to HTMLReportWindow.
Got HTMLReportWindow to work with iframe and scrolling and expand all collapse all working.
More overlay.xul and related fixes to launch HTML Report in xul window.
Added min window size code to HTMLReportWindow.
Moved remove styles routine to xul window.
Added print feature to the HTMLReport and the RemoveStyles windows.
Updated the View Report button code in the inspector dialogs to call the HTMLReportDialog.
Added highlighters toolbar entry and started debugging highlighters code.
Added icon for the highlighters on the toolbar.
Added highlighters menu.
Updates to dev notes.
Updated version to 1.0-b12
Merge branch 'blr-HTMLReportDialog' into develop
Merge branch 'develop'
Merge branch 'master' into ver1.0-b12
using new settings for mountain lion
compact layout cleanup...removed testing scripts
Merge pull request #532 from stevewithington/bootstrap

compact layout cleanup...removed testing scripts
Removing 'include on contact form'
Корректная проверка начала пакета
use 'opds' extension for OPDS pages
add invite friends button
automatic unregistration on normal program exit
Character death (WIP)
rbenv completion #1
loading plugins completions
fixed robbyrussell theme to use bold colors.
using prompt_pwd instead of $PWD to show home as ~.
Merge pull request #8 from tanob/fixed-theme

fixed robbyrussell theme to use bold colors.
added braces to be consistent
Minor refactoring needed to work with the hosted service

Note: for the setting of @token_login_key I'll switch this to use the new
approach for setting default configuration as soon as it makes it to master.
Updates vimrc to use pathogen
Moved code to new purchaseOnNewegg
Merge branch 'master' of github.com:brian-l/boxbuildr
Separate the hmac code from the message-string generation code.
Fix #19, Fix #25 and Fix #26
Managed table model cell was not reloaded if upated
starting vig revision
Starting to compare data in my output to the sample. My numbers are ALL f'd up. Awesome. Fixed a couple more spacing issues.
CSS now injected in a CSP-friendly way
Handling command switch.
corrigida a função de geração de pairings.
add .autotest
Applying changes
Added user authentication with bcrypt, soon I will do a clean up of the database and server.

Merge branch 'master' of github.com:bwalex/ChipTester

Conflicts:
	server/Gemfile
	server/init.rb
Added user authentication with bcrypt
Merge branch 'master' of github.com:bwalex/ChipTester

Conflicts:
	server/Gemfile
small update on latex, tables fixed, also a couple of other minor faults fixed
added Interaction package and moved class to it
added attributes to ai
Getters and setters for Selected unit written in GameMode, have not switched over
Fixed weapon spread
Fixed accuracy of the m4 shotgun
[#2332] Add tooltip-error class to correct element
trying to change port on tests to see if travis will work
values more consistent with hx optimization results for te params
add test for passing sub-objects to validators
do not allow extra properties by default
tweak: grid
Merge branch 'develop' of github.com:capensis/canopsis into develop
add: fix previous fix
Merge branch 'develop' of github.com:capensis/canopsis into develop
tweak: dont init submodules
change: adjust window size
Merge branch 'develop' of forge.capensis.org:canopsis into develop
clean: clean code
fix : prevent the opening of a second operator options form window and prevent the resize of the window
add_account remove_account
unit test
A couple of cosmetic changes
reduced repetition in model methods. debugging encoding issues for json sent to browser.
Merge branch 'master' of github.com:carlschroedl/conj

Conflicts:
	dj/mysite/conj/views.py
Minor tweaks to ShellsortProficiency.css
Restructured repo

Better error control system.
Moved most of the code into actions.c.
Added Vim modelines.
Added -pedantic to compiler flags.
Snapshop 23. February 2012
Starting lib rewrite (refactoring)
Merge branch 'libedit' into develop + restructure

Conflicts:
	src/bm_util.c
	src/bm_util.h

Restructure the library quite largely,
especially bm_list and bm_list_str and bm_util.
Bugfix: PKGNAME extended to support underscore

repo did not correctly identify packages with underscores in the
name portion.
Update: /bin/tr -> /usr/bin/tr

In Arch Linux the path to tr has changed.
Perhaps I am doing this wrong by giving absolute paths.
Forgot to remove the files from contrib/
Fixing a bunch of bugs
Using libcassava instead of bm_*
Updating main.c and Makefile.am for libcassava
Relativizing paths in zsh_completion
Updating libcassava
Add debug notification and disable debugging info
Updating metafiles
Merge branch 'develop': for version 1.9.3
Alphabetize list of support languages
Remove linebreaks for consistency
Include linebreaks before comments
Add java to builder
Rectangular partition for LU decomp works
修复用户中心修改资料时候的错误bug
readme not needed for this branch
Larger tiles for JUMP nodes.
added sublime cli
improved gitconfig
Swift Object filter improve and fix
bug#1013409
bug#1013412

Change-Id: Ib2efa534622793bfa9f190d74e3b91cc66e7516a
Removes Horizon's "time" module.

The module was an unnecessary hack for lazy test-writing.

Implements blueprint remove-horizon-time-module.

Change-Id: Ibeabd2b1689619a8e00c3346cef9401e5850d375
Adding the bin dir and lessc binary to the manifest file.

Change-Id: I5abfc72714e24aa6a30adcd335be3fd085cdfe79
Cleans up the settings files.

Removes deprecated settings, makes sure os.path.abspath is
always used consistently, and generally tidies up.

Change-Id: Ib0e3ef454ac8c9ef74e987b6088df6c744a2ab44
Don't use freed memory when a global is initialized to itself.  Fires with
gcc-4.7 on Sema/const-ptr-int-ptr-cast.c from the clang testsuite (which is
tested by dragonegg's "compilator").


git-svn-id: https://llvm.org/svn/llvm-project/dragonegg/trunk@156262 91177308-0d34-0410-b5e6-96231b3b80d8
add Lua bindings to Ruby
Keep document type when creating via relationship

- When creating documents and immediately relating them, make sure the content type is not lost
- fixes #9
MIT license, also. Webgl mostly implemented now. Untested.
writing tests to try to reproduce a defect
Merge branch 'master' of github.com:cheezy/data_magic
markdownに渡す文字列をhtml()からtext()に変更
Adding vrome options file
Update lib/maid/tools.rb

add some tips for multiples directories in 
* move
* dir
git ignore
Add item
Delete tasks
Revisionsjahr hinzugefügt
Fixed NPE when response message is null
Add function to compute length of lc3 object file
Changes to Xdefaults/Xresources
autotest: Fix the path to the rootfs of libcs.

Signed-off-by: Junjie Mao <eternal.n08@gmail.com>
mailer is configured back to localhost, updated the seed file
clang: don't add "()" to function name

clang generates "void XXX()" by __FUNCTION__ so we don't need to add
"()" to indicate it's a function.
Add updated submodule references for master
Pull Sledgehammer back into Crowbar, and base it on Centos 6.2.

This allows Sledgehammer to reuse the build infrastructure that we
already have for Crowbar, makin it easier to build and maintain
Sledgehammer images.

This also restages Sledgehammer to be built on top of Centos 6.2.
Merge pull request #310 from cloudedge/142aa9f647c677b2711cf5ed70d98571887c1859

IE fix for barclamps view [2/5]
Remove support for a custom tcpdump
Make sure tcpdump is intstalled before ohai runs for the first time.
Make build_crowbar try to build sledgehammer if it is not built.
Update README.sledgehammer to describe the updated Sledgehammer build process.
Update Sledgehammer documentation
Eschew barclamp merge conflicts.
Merge branch 'master' into feature/sledgehammer/master
Move barclamp submodule refs back.
Add updated submodule references for feature/sledgehammer/master
Merge pull request #315 from VictorLowther/feature/sledgehammer/master

Update Crowbar to generate Centos 6.2 sledgehammer images. [3/6]
Pull in latest changes for Paul
Merge pull request #319 from galthaus/8baa228787ebeee228ec7fe609c8ac476359a466

Update refs on things. [1/4]
Update notes for submitted changes

* Ask for confirmation when renaming job
Prepare stemcell builder for Ubuntu 12.04

Changes that affect all builds:
- Use libreadline6-dev instead of libreadline5-dev
- Disable SSL support for monit
- Disable SSLv2 for Ruby

Change-Id: Ie0d048b22754dbf9f5fecb48891b2c1fbddabc3c
Merge "Prepare stemcell builder for Ubuntu 12.04"
Implement also gradients over whole body
Push also one example image
Import needed Windows dynamic libraries
Support Portsmouth Yardstick
updates gems
uses space_subdomain instead of space_link for parsing the subdomain
fixes omniauth hash now has raw_info instead of user_hash
Make sure HelloCpp can be full screen.
Merge pull request #1672 from dumganhar/gles20

Make sure HelloCpp can be full screen.
update javascript/bindings/generated/ submodule revision pointer
Merge pull request #1412 from walzer/gles20

update javascript/bindings/generated/ submodule revision pointer
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Merge pull request #1652 from minggo/gles20

Gles20
Added improved strategy for extracting content
update gemspec in preparation for v0.0.1 release
added cross browser opacity rules
refactored so only start event is bound while not interacting
Introduced alert banners and zero-state variant of alert banner to close #140; also applied logic check to determine color of Moderate button badge to close #141
Changed list grid template preview tooltip to be less annoying
Exposed UXValueViewController labels.
Rename to object/filter and object/map
Clarify docs for object/map and object/filter
Added Game design workbook
refreshed windows resource file for 1.2
Ensure view merger reuses sockets more often

For the cases where the merger kills remote view folders (for e.g.
queries with ?limit=N), ensure that the folders pull out all data
from the connection socket so that it can be reused for future
requests/queries.

Change-Id: I7fca0503103de07fbdfe5fae612689a5f256ae1e
Reviewed-on: http://review.couchbase.org/14592
Reviewed-by: Damien Katz <damien@couchbase.com>
Tested-by: Damien Katz <damien@couchbase.com>
Added t.co Link Extension from cdn

https://github.com/cdn/tweetnest
Revert "Added t.co Link Extension from cdn"

This reverts commit 6c0b2861088b7deb11c9f1a6498fb593946865de.
Allow bundles to respond to root requests.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Signed-off-by: crynobone <crynobone@gmail.com>
Comment urls.py more thoroughly

Split up sections in footy/urls.py and comment them better
Add search

Add an initial search page powered by Haystack and Xapian. Still needs a lot more tweaking though.
additional refactorings that apparently didnt survive
Add README.md and trivial main()
Added version queries.
Rename method in README
Adds emojis endpoint support :metal:
Version bump
replace system.out by logger + Fix self verification: use self groupId/artifactId/version
Started Epam intro restructuration
Epam intro lecture restructurated
submit formula for darkstat
a network statistics grapher, collector
http://unix4lyfe.org/darkstat/
Merge branch 'master' of github.com:dam5s/happymapper
Updated gemspec version 0.5.2
Added tutorial of sorts
run without snap for now

Snap is timing out the WS connection after about 1 minute
New <Esc> replacements: <Tab> and "jk"
fixing bug with gitignore
removed psd from assets/img/
Add question done
example now universal
Bugfix. Instead of checking for the presence of LABEL/BUMP, check whether their value is set to 'yes'.
Merge pull request #27 from joejimbo/master

Check for boolean values of LABEL/BUMP
start at cutscenes
added navigation links to the index page
add development as standard branch to bash/commands
AutoClose should not load on smarty templates either
eggdrop upstream URL
Merge branch 'master' of github.com:davidhrbac/cnucnu
perl-WebService-Pushover & perl-Dancer upstream URL
Fixed some compilation problems with release mode.

Compile all in-one library (which should be faster), temporally disabled.
Added case insensitive dictionary search (onion_dict_iget) and use it at header check at onion_request_get_header.

Modified tests to check the scenario of when headers are not no 'standard' case.
Updated Grape dependency via .gemspec.
#1 Unit test - code is not adapted yet
#1 Rollback section
#1 Does not use the script error level any longer
updated gemlock file for pg addition
commited with the tutorial
Deleted all Dll Files
Merge branch 'master' of github.com:defyjoy/MvcWebApi

Conflicts:
	.gitignore
	MvcWebApi.Contracts/bin/Debug/MvcWebApi.Contracts.dll
	MvcWebApi.Contracts/bin/Debug/MvcWebApi.Contracts.pdb
	MvcWebApi.Contracts/obj/Debug/MvcWebApi.Contracts.csproj.FileListAbsolute.txt
	MvcWebApi.Contracts/obj/Debug/MvcWebApi.Contracts.dll
	MvcWebApi.Contracts/obj/Debug/MvcWebApi.Contracts.pdb
	MvcWebApi.Data/bin/Debug/MvcWebApi.Contracts.dll
	MvcWebApi.Data/bin/Debug/MvcWebApi.Contracts.pdb
	MvcWebApi.Data/bin/Debug/MvcWebApi.Data.dll
	MvcWebApi.Data/bin/Debug/MvcWebApi.Data.pdb
	MvcWebApi.Data/bin/Debug/MvcWebApi.Models.dll
	MvcWebApi.Data/bin/Debug/MvcWebApi.Models.pdb
	MvcWebApi.Data/obj/Debug/MvcWebApi.Data.csprojResolveAssemblyReference.cache
	MvcWebApi.Data/obj/Debug/MvcWebApi.Data.dll
	MvcWebApi.Data/obj/Debug/MvcWebApi.Data.pdb
	MvcWebApi.Models/bin/Debug/MvcWebApi.Models.dll
	MvcWebApi.Models/bin/Debug/MvcWebApi.Models.pdb
	MvcWebApi.Models/obj/Debug/MvcWebApi.Models.csproj.FileListAbsolute.txt
	MvcWebApi.Models/obj/Debug/MvcWebApi.Models.dll
	MvcWebApi.Models/obj/Debug/MvcWebApi.Models.pdb
	MvcWebApi.suo
	MvcWebApi/MvcWebApi.csproj
	MvcWebApi/bin/DotNetOpenAuth.AspNet.dll
	MvcWebApi/bin/DotNetOpenAuth.AspNet.xml
	MvcWebApi/bin/DotNetOpenAuth.Core.dll
	MvcWebApi/bin/DotNetOpenAuth.Core.xml
	MvcWebApi/bin/DotNetOpenAuth.OAuth.Consumer.dll
	MvcWebApi/bin/DotNetOpenAuth.OAuth.dll
	MvcWebApi/bin/DotNetOpenAuth.OpenId.RelyingParty.dll
	MvcWebApi/bin/DotNetOpenAuth.OpenId.RelyingParty.xml
	MvcWebApi/bin/DotNetOpenAuth.OpenId.dll
	MvcWebApi/bin/DotNetOpenAuth.OpenId.xml
	MvcWebApi/bin/MvcWebApi.dll
	MvcWebApi/bin/MvcWebApi.pdb
	MvcWebApi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MvcWebApi/obj/Debug/MvcWebApi.csproj.FileListAbsolute.txt
	MvcWebApi/obj/Debug/MvcWebApi.csprojResolveAssemblyReference.cache
	MvcWebApi/obj/Debug/MvcWebApi.dll
	MvcWebApi/obj/Debug/MvcWebApi.pdb
fixed nasty bug with buffer being to small by 10 bytes (tag header).
added simple JDBC file store.
sshkey in .env
Merge branch 'master' of github.com:scslab/gitstar-ssh
Updated ssh to use cookies instead of basic auth
Allow gitstar.com:user/repo style as well
Updated Gemfile
username+password vs. direct authroization

woops, init_bare
support forking
added channelislands directory
* Added missing doxygen parameter comment
don't reopen log files many times
added subject
added makefile
first working version, the reading part of the automata is horrible
Fix for #restrict context of Collection#insecurely
Merge branch 'features/relation_insecurely' into wip
Add copyright in footer
Change header logo to route to home page
Copy content from old site
fixed bug in address formatting

street lines should have been lists, but they were being written as
vectors

also fixed some formatting issues around spacing
Save As Function gefixt
Got program working with small LCD screen.
Updated README.
Changed id fields from String to int and added @GeneratedValue annotations.
Also removed setId() methods from models.
changes in styles
Merge branch 'master' of github.com:devbliss/homepage
viewの複数チーム対応。取得部分をcontrollerに移動。
updated coursera assignment
Merge github.com:devsundar/whoopee
added files for problem 07
completed problem 07
fix bookmarklet on mobile
MS DG down to four failures
no more rspec failures; and suppress a warning with a backported
monkeypatch
First commit: README
First commit: README
GPL3 license
Initial commit: All files
Added a sample script.

This script shows how to read an RTPConnect file, change some of its
attributes, and write the modified object to a new file (with new CRC
values).
Fixed typo.
Fixed URL.
Gem release version 1.0.
Minor edit.
Minor script edit.
Changed file name.
Added script for monitoring a folder

This script runs in a continuous loop and checks for new, incoming RTP
files, which it modifies as they are discovered.
File renamed.
Minor edit.
Added unique-valued read-write specs

This should guarantee that the read-write process is correct.
Minor edit.
Checksum related fix.

Reading a string with a single digit checksum would incorrectly fail.
Updated developer dependencies

Modified rakefile instructions to use bundler as is the proper way.
Added documentation link
Fixed values with comma

Previously, the rtp-connect library would fail to properly parse an RTP
file with one or more values containing a comma.
Merge branch 'master' into embedded

Conflicts:
	touchforms/formplayer/views.py
Use Kotti master for travis tests.
Update apps/roundcube/src/lib/mail.php

Added doublequotes to SQL columnnames. If they aren't there, PostgreSQL (perhaps other too) will raise an exception.
Update apps/roundcube/src/userSettings.php

Added doublequotes to columnnames in OC_DB::prepare. Without this, PostgreSQL (perhaps others too) will raise an exception.
PyFlakes: add success test
PyFlakes: add failure test
PyFlakes: fix handling of warnings

The buildstep tried to return WARNINGS or FAILURE depending on the
severity of the warnings issued. However, this didn't work since
PyFlakes always return 1 if it finds any warnings or errors. A return
code of 1 is now decoded to mean WARNINGS, and the evaluateCommand
method will then classify the result further.
Merge pull request #539 from mgeisler/pyflakes

Pyflakes
Revert "Merge branch 'yamlconfig' of git://github.com/tardyp/buildbot"

This reverts commit ec125d1fc0fb2f36fc94fffebc4d8228164079af, reversing
changes made to 1fa1c4fc511ee6d3006594c8eb3c26c969d7e598.
Merge branch 'master' into nine
Revert "Revert "Merge branch 'yamlconfig' of git://github.com/tardyp/buildbot""

This reverts commit fcf5fe2326f715fb9031d26cf5e1e29fbab49534.
Add buildsets to the data API

* addBuildset moved from master to a data update method
* schedulers updated to match (note that the addBuildsetForXxx methods
  are staying in BaseScheduler)
* assertBuildsets can skip asserting on buildsets.  This is ugly, but
  once everything else is in the data API, can be straightened out.
use ascii2unicode, rather than .decode('utf-8')

..and use unicode literals
handle bsid==None in assertBuildset
fix typo
Test fixes per tomprince's review

* add docstrings for test utils in test_data_buildsets.py
* use symbols for arbitrary epoch timestamps
add docstrings and factor out fake messages in Dependent tests
fixup! use ascii2unicode, rather than .decode('utf-8')
refactor base scheduler tests to not use assertBuildset
Factor out buildset addition testing

Only test schedulers' calls to the BaseScheduler addBuildsetForXxx
methods.
Merge branch '9/buildset-rtype' into nine
Merge branch 'nine' of github.com:buildbot/buildbot into nine
Adding the java assembler to the project
Styled the User SShow Page
die json.net die
Merge from RestSharp/RestSharp
Further fix to blocks
removed vim folder syncing
Remove obscure padding in xmonad config
profile view,blank screen bugfix
update to 1.1s01
Move to new subresource map system
made dashboard for active admin
Split one large tests into several separate tests in ChanceTester.
Added production html that includes the production flotr files
Some more attempts at fixing the server
add .conkerorrc
Add a new line for test by tangbo
Add tentative support for SQLITE_LOCKED
Add spec for concurrency (failing)
Refactor wrapping SQLite errors in COMExceptions
Set default temp store to memory
Introduce explicit setting for shared cache mode
Explicitly capture 'this' in lambda

A shot in the dark while debugging sporadical RPC_E_WRONG_THREAD
Report last error and autocommit mode
ember example added
gameplay is there, only second ending, options and about screen are missing
Changed findAlbumID to use the musicbrainzngs library, identical output.
add hidden property to drawable object
hack
Back to aws
made the tracing system more robust and less intrusive then it fails
Added setNewPower to RedstoneChangeEvent

Signed-off-by: dredhorse <dredhorse@breiden.net>

Signed-off-by: dredhorse <dredhorse@breiden.net>
Implemented FurnaceActionEvent

Signed-off-by: dredhorse <dredhorse@breiden.net>

Signed-off-by: dredhorse <dredhorse@breiden.net>

Signed-off-by: dredhorse <dredhorse@breiden.net>
Merge pull request #413 from dredhorse/RedstoneChangeEvent

Added setNewPower to RedstoneChangeEvent
Implemented BlockChangeCause for Form, Grow, Ignite and Remove

Signed-off-by: Don Redhorse <dredhorse@breiden.net>
Merge pull request #415 from dredhorse/BlockChangeEvent

Implemented BlockChangeCause for Form, Grow, Ignite and Remove
Merge pull request #414 from dredhorse/events

Implemented FurnaceActionEvent
Add LightBufferEffect

Signed-off-by: L5D <cholley.thibaut@gmail.com>
Merge pull request #416 from L5D/master

Add LightBufferEffect
[JBRULES-3499] update betaConstraints while doing the updateSink of a FromNode
[JBRULES-3080] add test case
JBPM-3812 - Allow to inject ksession into workitem handlers via conf file
JBPM-3812 - remove cache of WorkItemHandler instanes from SessionConfiguration
JBRULES-3606 Project Model and CDI Generation
-Big refactor, using synthetic beans and no longer uses generated code.
-Handles discovery of jar/folder META-INF/kproject.xml
finish the other announcer panel bugs, can't replicate Move 1 to X.  Could be fixed by first change
Remove superfluous closing div tag
Added utility methods for parser
Add network links; add \Colorhref but I can't find a sane color. http://google.com/search?q=moderncv+link+color
Added 2.4.6 to the allowed versions for ZPsycopgDA

Dropped beta versions and the versions with the messed up isolation level
constants.
Show all the available isolation levels in ZPsycopgDA menu
Use set_session instead of set_isolation_level where available

Avoid spurious queries as reported in psycopg2 ticket #125.
Added specific pool implementation for ZPsycopgDA

The implementation is based on psycopg 2.4, which should be less broken
(zope-wise) of the current one.

Instantiating psycopg2.pool.PersistentConnectionPool now raises a warning.

This should fix ticket #123, #125. The issue of the reset on
set_client_encoding() is still present but that's always been there and I'm no
good at fixing it.
+ gitignore and some initial stuff
install.sh: Replace depth with min/maxdepth & exclude git metadata files.
.vimrc: Disable Vundle & remove weird symbols.
.bash_profile/.bashrc: Change way to detect if shell is interactive (from Arch skel).
.bashrc: Remove LESS override in MANPAGER (wierd error) & switch to GNU ls color.
.bashrc: Add dl_aur_pkg func.
add ruby2.rb
Modified ruby2 file
Added inital documentation
new frmDlg to replace threadlocking common controls. cant find it not worth the fight...
Cleanup with help from pylint, etc
some improvements to writing image data to imaris format. now resizes dataset to write an integer number of 128 blocks. changed size of thumbnail to 256x256*aspect ratio
Merge pull request #15 from edestler/master

Autoreconfed
Merge pull request #1 from mialinx/master

merge
up
Merge branch 'master' of https://github.com/edgarhoo/just-dev.git
remove tip html markup,use Bubbletip widget
change order module position to relative(fix ie6,7 tip issue)
up
Prepare eea.eggmonkeytesttarget 4.5.
gemspec and rvmrc fixups
renamed bin/rsox to bin/ruby_sox
Maxium
Dialogs
UpperCase
UpperCase
Translit
Added persistence to "talk" and "edit" sidebars - page reads location hash
and opens relevant sidebar if #talk or #edit is found.  Should improve
comment behavior.
first draft of source code
Adds a logout button and a notice when logging in
Improves the main-container media queries
It is MUCH faster to directly construct a fake dictionary!
fix for Padrion's form helpers
add credit pe
add emulation of FormData
slime-indentation: fix long lines
slime-indentation: correct indentation for &AUX value forms in lambda-lists
slime-indentation: don't indent non-lists as if they were lambda-lists

  Not even if they appear where a lambda-list is expected.

  Makes TENTATIVE-DEFUN logic more correct for things like

     (define-foo name
       :option1 bar
       :option2 quux)

  which previously indented as

     (define-foo name
         :option1 bar
       :option2 quux)

  .
Ajustes Profile (quase final)
always forget to do cachebusting version bump
repoman: fix getstatusoutput more, bug #310789
ResolverPlayground: simplify vdb/portdb creation

This enables automatic handling of HDEPEND.
Remove obsolete cache/flat_list.py

This module has been obsolete and useless for many years, which is
especially obvious since it was missing INHERITED from its
auxdbkey_order and it did not write any eclass metadata.
EAPI 5: usex helper function

See bug #382963.
Fix usex for EAPI 4-python|4-slot-abi.
Update years in header.
Made it so that the node websocket server will not drop the connection

My simple websocket client doesn't pong on pings so the websocket server
was dropping the connection
Made descending by ID sort the default on CRUD index pages
"Final" version.
Added textures.
Added GLUT libraries.
Using VC++ now, boooo
.gitignore for stupid DS Store files
Updated README to reflect major changes.
Abril_16
fixed linux id