labofsahil/github-event-dataset-2012 huggingface dataset:
put the proxies alongside there ruby counterparts. Maybe we can start to load them by convention.
extract describable logic so that native classes can be easily described
ignare .gradle/ directories
Merge branch 'one-stop-native-describables'

Conflicts:
	ruby-runtime/lib/jenkins/plugin/runtime/version.rb
invoke default Java constructor
update jpi deps
don't do unecessary shell-out
Modify the version tag to be tool specific.

Perhaps we'll want to log the cli and runtime
gems to the same version in the future, but for
now let's let them vary, and not clash because
they're in the same repo now.
Make tmp files hidden
Add missing needthis sets
Remove compiled bytecode
Don't show join link if event has no time left.
Merge pull request #79 from gerald/time_left_for_event

Don't show join link if event has no time left.
correcciones en el modelo de la base de datos
exclusion del .config
* alterações do lap + artigo_ubiqua
move trunk to 0.4.0
correct errors in the Ethif names
Merge http://github.com/crotsos/mirage-net
add a Manager.create ?devs function to socket, to match the direct one that @crotsos added
add CHANGES
bump version
Merge http://github.com/mirage/mirage-net

Conflicts:
	direct/_vars
	socket/_vars
[ethif]: expose the 'default_process' for input frames

This allows an interface to be set into 'promiscuous' mode and still
operate as a full network stack.
[ethif] call the 'promiscuous' hook on the write path, as well as the read path

This requires changing the promiscuous interface to take either an Input
single buffer or an Output buffer list (since writev will write a list of
fragments)
Merge pull request #6 from djs55/promisc

Extend the promiscuous hook to capture in both directions on a running stack
Simplify and fix the DHCP marshalling for ip addresses by re-using the uint32 marshaller.

This code *really* needs to be ported to cstruct and/or moved into a separate library.
sync CHANGES
release 0.3.1
fix compilation to work with ocaml-4 (just changes in tags)
update CHANGES
suppressed arp who-has message
suppressed messages in ethif and ipv4 and added arp response message
Fix in fast recovery so it stays in fast recovery till all pkts that were in flight when first loss was signaled are acked.
iperf to self - requires two vifs to work
Merge pull request #8 from balrajsingh/window-fix

window fixes
total rewrite with new symfony version
Merge branch 'master' of github.com:cs4347-utd/project

Conflicts:
	app/config/deploy.rb
lighter bottom
c2x fix fix fix
No placehold.it in production
TSVN revision 23738 WIP

the code compiles

next steps:
fill gitpatch will necessary code
cleanup Resource (strings)

cleanups:
TempFile.cpp
mainFrm if 0 + necessary

Signed-off-by: Sven Strickroth <email@cs-ware.de>
added 'neurons' parameter to BG template, changed 'D' and 'N' to 'dimensions' and 'neurons' in /nps/basalganglia.py file
Merge branch 'master' of https://github.com/ctn-waterloo/nengo
The entire program is fully documented.

In other words, I finished documenting the last file left, XMLLoader.

I also made a few changes within XMLLoader, removing some redundant code
here and there.
fixed trapping, introduced TrapListener,  some renaming
fixed equal  ContentIdentifier bug
Fix styling of overlay text
tmux-powerline now submodule
base support for change logs.
Cleaning up async methods
Fix boot issue with BFS and linux-3.6.patch

linux-3.6 with BFS 425 seems not to boot on kvm.
I use this command to start the VM
qemu-kvm -smp 3 -m 1G ../virtual/Ubuntu.12.04.qcow2 -kernel ../tmp-linux-3.6/arch/x86_64/boot/bzImage -append "root=/dev/sda1 console=ttyS0" -s

Using gdb to see where the kernel hangs shows following:

(gdb) target remote :1234
Remote debugging using :1234
0xffffffff816d2321 in _raw_spin_lock_irq (lock=lock@entry=0xffff88003fc8e440) at /home/findus/kernel/linux-3.6-bfs-not-booting/kernel/spinlock.c:152
152	{
(gdb) backtrace
 #0  0xffffffff816d2321 in _raw_spin_lock_irq (lock=lock@entry=0xffff88003fc8e440) at /home/findus/kernel/linux-3.6-bfs-not-booting/kernel/spinlock.c:152
 #1  0xffffffff81070d1e in spin_lock_irq (lock=0xffff88003fc8e440) at /home/findus/kernel/linux-3.6-bfs-not-booting/include/linux/spinlock.h:310
 #2  worker_maybe_bind_and_lock (worker=0xffff88003e1c9240, worker=0xffff88003e1c9240) at /home/findus/kernel/linux-3.6-bfs-not-booting/kernel/workqueue.c:1288
 #3  0xffffffff810740fc in idle_worker_rebind (worker=0xffff88003e1c9240) at /home/findus/kernel/linux-3.6-bfs-not-booting/kernel/workqueue.c:1323
 #4  worker_thread (__worker=0xffff88003e1c9240) at /home/findus/kernel/linux-3.6-bfs-not-booting/kernel/workqueue.c:2166
 #5  0xffffffff8107913e in kthread (_create=0xffff88003e1dfc18) at /home/findus/kernel/linux-3.6-bfs-not-booting/kernel/kthread.c:121
 #6  0xffffffff816dc104 in kernel_thread_helper () at /home/findus/kernel/linux-3.6-bfs-not-booting/arch/x86/kernel/entry_64.S:1216
 #7  0x0000000000000000 in ??

This patch fixes the issue.
first commit
Merge branch 'master' of https://github.com/damirrr89/testRepo
working thickE
Fixed tv project
Tiny copy edit.
	modified:   README.md
home: fix copyright date

One day I'll learn what year it is.
home: g_message -> g_debug

Export G_MESSAGES_DEBUG=all if you wish to see debugging messages.
Creacion de aplicacion

Creacion de la aplicacion y la clase artista
Remove collision Cython files (not needed)
[trivial] Fix indent
Remove to_update
Rename player_lives > lives
Remove *args from on_draw()
Move bullet drawing and update up to Stage
Make Enemy take BulletGroup and Stage make for it
Fix 71e0e804b Remove extension from setup.py
Add Circle-Rect collide functionality
Differentiate Group and BatchedGroup
Add remove() delete()
[trivial] move CollidingSprite
Add collide_group()
Add CollidingGroup and BatchedCollidingGroup
Change inheritances for collision
Give Bullet dmg
Give Enemy life, hit(), die()
Give Player die(), invuln
Let Game handle collisions
Move CollidingGroup definition up
msm: Asoc: audio: Migrate to ION from pmem, dma alloc
msm: vidc: suppress non-fatal error messages.

These messages are non-fatal and appear frequently
during video session. Hence suppressing them.

CRs-fixed: 389408
Signed-off-by: Arun Menon <menon@codeaurora.org>
(cherry picked from commit 24631e349a3f306cc3b06fb411d5fb1f7ac8f0ae)

Conflicts:

	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.c

Change-Id: Ifb874912ac79c863ed8fc531272d3822d8aebebe
Signed-off-by: Ramakrishna Prasad N <crpn@codeaurora.org>
msm: board 8960 and 8064: Increase ion heap size for audio.

After migration from pmem to ion, we need to
reduce EBI1 memory for audio usecase and make a
corresponding increase the ION heap size.

Change-Id: I98ba83cff86760be078ef1d8a7e7a03b9e71db8d
Signed-off-by: Jay Wang <jaywang@codeaurora.org>
Updates Ghastly for OpenGL 3.2 Core compliance.
help works with argument now.
Added to copy module: Error handling for missing permissions on the copy destination
Copy module: Extended error handling and fixed error messages
Import ansible errors in Poller.
Merge pull request #504 from gottwald/devel-copyfix

Copy module: Error handling for missing permissions on the copy destination.
Merge pull request #506 from jhoekx/import-errors-poller

Import ansible errors in Poller.
Add ./library to module search path.

It allows for custom modules in the best practices directory structure.
Bundling custom modules along with playbooks in packages is useful.
Merge pull request #507 from jhoekx/convention-library-path

Add ./library to module search path.
Add basic support for Solaris
Merge pull request #510 from ludovicc/devel

Add basic support for Solaris
added ability to ovverride all ssh settings via ANSIBLE_SSH_ARGS
Merge pull request #511 from dsummersl/devel

added ability to ovverride all ssh settings via ANSIBLE_SSH_ARGS
Correctly add ungrouped hosts to 'ungrouped' in YAML inventory.
Merge pull request #512 from jhoekx/yaml-inventory-one-host

Correctly add ungrouped hosts to 'ungrouped' in YAML inventory.
Remove the -D module debug flag, which no longer is functional due to sudo pty requirements, and replace with -v/--verbose.

This flag will show playbook output from non-failing commands.  -v is also added to /usr/bin/ansible, but not  yet used.

I also gutted some internals code dealing with 'invocations' which allowed the callback to know what module invoked
it.  This is not something 0.5 does or needed, so callbacks have been simplified.
update changelog
Fix up the output of the raw module when run within /usr/bin/ansible
Add some recent merges to the changelog
Update src/com/dave/GeneralTest.java

cloud edit
Movement delay wasn't working because inkey_ex() wasn't handling timeouts correctly.
Avoid the extraneous comma if the first known pval is not #0.
Make deep descent based off of max_depth instead of current depth
Update dependencies (ick)
Fix #1300 (Roguelike keyset needs 'walk into traps' command) & #1604 ('K' in roguelike keyset conflicts with run north):
 * Ctrl-G was already assigned to K in roguelike keyset, so update docs to reflect this
 * Map '-' (old 'flip pickup' command) to 'W', update docs
Fix #1252: Move roguelike keys into game code, simplifying a load of things and allowing the Enter key menu to look right.
Fix a bug identified in the text of #1523 as a throwaway comment - the autopickup keymap for the roguelike keyset was assigned to the standard one.
Fix ui-event changes
Update keymap docs (#1452)
Update version.txt with link to rephial
Attempt a fix for #1460 - as posted on the forum
Merge pull request #158 from takkaria/roguelike-fix

Roguelike fix
Merge pull request #159 from takkaria/keymap-docs

#1452 Keymap docs
Merge pull request #160 from fizzix/deep_descent

Make deep descent based off of max_depth instead of current depth
Merge pull request #161 from takkaria/1460-fix

Attempt a fix for #1460 - as posted on the forum
Content views: changed dictionary key in cli command
Update Boltzmann.
Update Boltzmann and add randomized puzzle sampling.
Redacted select group member info.
adding favorite posts
適当にREADME書いた
git-vimからgit-fugitiveへの変更による不要な宣言削除
removed choosecolor. i'm on linux
removed choosecolor. i'm on linux
removed vim-textobj-user
added splitjoin
updated submodules
added configurazione for splitjoin
remove sensitive data from scripts
minor fixes
Merge pull request #18 from giorgiocaviglia/master

Minor fixies changes after merging
[HF] force bash -shell

Joissain distribuutioissa hashbang ei anna vaihtaa shelliä, joten kutsutaan aina suoraan bashiä.
[HF] notice pois
Korjattu leiskaa niin, ettei mene papaerin ulkopuolelle!
Lisätään mapvm vielä ostotilausta rajaamaan, varmuuden vuoksi.
Alustavaa erittelyä tehty
automated commit from dev@dmehta Thu Dec  6 18:00:02 EST 2012
automated commit from dev@dmehta Wed Sep 12 16:47:36 EDT 2012
automated commit from dev@dmehta Wed Sep 12 16:55:50 EDT 2012
automated commit from @dmehta Wed Sep 12 17:00:01 EDT 2012
automated commit from dev@dmehta Wed Sep 12 17:17:05 EDT 2012
automated commit from dev@dmehta Wed Sep 12 17:26:29 EDT 2012
automated commit from dev@dmehta Wed Sep 12 18:00:01 EDT 2012
automated commit from dev@dmehta Wed Sep 12 20:00:01 EDT 2012
automated commit from dev@dmehta Wed Sep 12 22:00:02 EDT 2012
automated commit from dev@dmehta Thu Sep 13 00:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 02:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 04:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 06:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 08:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 10:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 12:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 14:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 16:00:02 EDT 2012
automated commit from dev@dmehta Thu Sep 13 18:00:02 EDT 2012
automated commit from dev@dmehta Thu Sep 13 20:00:01 EDT 2012
automated commit from dev@dmehta Thu Sep 13 22:00:02 EDT 2012
Disable vc-git until I install it everywhere.
Tentative functionality
Added notes on calibrating temperature, added temperature unit conversion, made DEBUG_TEMP print much more useful.
various changes
merging
[ticket/10308] fix language and user's total posts

language modified to be clear and select box disappears in case no
posts by user. user's total posts are fetched using a new query.

PHPBB3-10308
complete all CH6 topic
Fix number of classes
Fix error: digits dataset has 10 classes, not 9.
Add results directory (no results yet) and gnuplot scripts.
interface field support @ 12.6.29 -c
First snippet..
Manager
Added snippet for view
More snippets and autocomplete
Try to get travis working with sbt 0.12
-- Search Video Page updated with New Practice Levels

-
Local Commit

Local Commit for switching Branch
Changes need to be reviewed
Local Commit Adding Test.html

Got left out
fix test images
Add support for editing food
Working version of my gist implementation
textCapWords is better than textCapSentences for check list items
Arquivo sincronizado com a versao atual (18/04/2012), falta revisar e ajustar a identação do sgml
UINavigationController supper for clViewSize.
augment the generated youth value
add topics + posts + stuff
delete some smack
calendar html5
EventSvcBroker and EventModule refactoring.

Added the ability to get events excluding one particular group. This was
implemented as /events/{groupName}/external,
/events/{groupName}/upcoming/external and
/events/{groupName}/previous/external.
Changed the default for PageSize to 10, previously 1.
Added tests for the new functionality.
Add submodule handling to install.sh.
Change if/else to switch statement
Fix FindMaya doc typo.
Merge pull request #7 from drakeguan/fix_FindMaya_doc_typo

Fix FindMaya doc typo.
FIX #8 OSX compiler definitions are default
Merge pull request #10 from jhoolmans/issue_8

FIX #8 OSX compiler definitions are default
Nueva caracteristica
	Creados nuevas preferencias de usuario
		ingresadas esas preferencias en el modulo de usuario
Added hacks to work around Ubuntu 12 issues
Add test for HTML reporter
expandtab applies html and javascript
Fixed the 'helios_test.php' file to include the current pre-pended date. For test run only. (dromanSabia)
Merge branch 'master' of https://github.com/dromanSabia/helios
Haskell files

Signed-off-by: Douglas Drumond <douglas@drumond19.com>
new git aliases

Signed-off-by: Douglas Drumond <douglas@drumond19.com>
change options for yamato machine

Signed-off-by: Douglas Drumond <douglas@drumond19.com>
add haskell stuff to path

Signed-off-by: Douglas Drumond <douglas@drumond19.com>
add postgresql to path on Linux

Signed-off-by: Douglas Drumond <douglas@drumond19.com>
Alias commit and ci to be verbose

Signed-off-by: Douglas Drumond <douglas@drumond19.com>
Fix "=" alignment

Signed-off-by: Douglas Drumond <douglas@drumond19.com>
added common cards to database and cleaned up initialization
IMPORT (kilobyte): Remove unused MR_RES_{PIECE,SLICE,BLUDGEON} on next minor tag bump.
IMPORT (kilobyte): Fix a typo in Zin's formula... it's supposed to be (10 + random2(27)) * 2.
IMPORT (galehar): Fix target randomization when firing when confused.

 Used to go always toward (0,0).
In the middle of the incorporation of the LeponRel class, propagating to CutManager
Propagated LeptonRel class use. Not checked how it works, neither validated
Fully implemented LeptonRel. Missing pointers deallocation in vector<LeptonRel*>, probably switch to LeptonRel. Working with pure channels, discrepancies with mixed channels. Not working with fakes
Changed LeptonRel* to LeptonRel in containers.
Solved the mixed channels problem
Fakes is also working. For free has been resolved a bug in the branch master (which it is not present here because of structure of LeptonRel class)
Edited .htaccess to point directly to /documents/2012/06/01/dcmi-terms/
Renaming generated schemas and HTML documents in order to re-generate and compare.
    renamed:    ../dcam.rdf -> ../dcam-20120522.rdf
    renamed:    ../dcelements.rdf -> ../dcelements-20120522.rdf
    renamed:    ../dcterms.rdf -> ../dcterms-20120522.rdf
    renamed:    ../dctype.rdf -> ../dctype-20120522.rdf
    renamed:    dcmi-terms/index.shtml -> dcmi-terms/index-20120522.shtml
    deleted:    dcmi-terms/index.shtml-bak
Clearing out "old" copies of XSL scripts.
Re-generated schemas and RDFa file, compare with older copies - everything looks perfect.
    renamed:    ../../dcam-20120522.rdf -> ../../dcam.rdf
    renamed:    ../../dcelements-20120522.rdf -> ../../dcelements.rdf
    renamed:    ../../dcterms-20120522.rdf -> ../../dcterms.rdf
    renamed:    ../../dctype-20120522.rdf -> ../../dctype.rdf
    renamed:    index-20120522.shtml -> index.shtml
Merge branch 'master' of https://github.com/dublincore/website
This should fix the missing-PID-file issues
Start xvfb so it can actually run qemu...
Ondas.asm terminado
AnimatedSprite improvements. Players can now explode (although you won't see it with the near instantaneous respawn - that needs fixed).
Added whitespace spam filter
Moved AWS credentials to config file
Better junit testing.
just need to finish gather
Link to Wolf.
before introducing raw data audio player
introduced RawAudioPlayer, handles playing raw data more neatly
fixed bug when end of fragment was defined
Added SendStudentAnEmail - Does not work

Need to troubleshoot
Button for applying to take a course now works - but does not add student's to classes, give them error messages, etc.

Signed-off-by: ecnalyr <ecnalyr@gmail.com>
probaaaando
Adds opts
initial commit

duplicated from a private fork...
5 minute edit/delete window now coded i in User model for less thinking
upvoted articles and comments done with a join sql query, still need to be DRYed
Vote.contains?(user, votable) coded in
vote_finder methods DRYed up in a module
Voting Module refactored a bit, still work to be done on it
buttons now come and go based on cancan's thoughts
refactored tests to meet refactored code
add sample/memoization-test.egi
update Set definition
Removed the lustyjuggler warning supression.
3.change in master
Fixing the code?
file reading in thread NOT WORKING
Document __record__(:fields) behavior
Update lib/elixir/lib/string.ex

Fixed wrong example
No need to special case the compiler_clause anymore
Invert the order arguments are handled on in
Revert "Work around a dialyzer bug"

The dialyzer bug was caused because orelse clauses was generated
from inside out. For example, the following clause:

    var in [:a, :b, :c]

Was generating:

    ((var == :a orelse var == :b) orelse var == :c)

Instead of:

    var == :a orelse var == :b orelse var == :c

While it isn't clear why the first one caused the dialyzer to
hang, the `in` operator was fixed to output the second in the
previous commit.

This reverts commit 3c15bcc36f6cd3bfda75c4129a6bea135ac2315d.
enable redis counts
runserver utilizando as configurações locais
alterada a ordenação dos campos dos forms de membro
adicionado configurações de servidor de teste do pagseguro
adicionado testes iniciais de edição de usuario
added heroku config
added gunicorn
move requirements to project root
move lxml requirement to project requirements
added Procfile
changed procfile
added static urls
chenge error message
added *.pyc to git ignore
adicionado campos do User ao form de edição
added - comentário do UserEditionForm - precisa de refactoy
added - javascript block para adicionar js localmente
adicionado block para extra css
added css - diminuir altura dos text_area's
test added  - members
Merge branch 'master' of git://github.com/cadu-leite/associados into cadu-leite-master
Add contrib to eproject.rcp's :load-path
Fix run-test.sh and run-test-interactive.sh

Otherwise, run-test.sh fails with the error:
(file-error "Opening output file" "no such file or directory"
"/tmp/el-get-test-home/.emacs.d/el-get/.status.el.old")
Fix el-get-package-name/symbol
Check if update is needed when merging status
Cache el-get-status-cache
Merge pull request #833 from tkf/fix-run-test.sh

Fix run-test.sh and run-test-interactive.sh
Merge pull request #834 from tkf/smart-merge

Smarter el-get-merge-properties-into-status to fix slow startup
Merge pull request #832 from tkf/eproject-contrib

Add contrib to eproject.rcp's :load-path
Add more properties to whitelist
Some editing of the changelog, release is Real Soon Now
Make docstring for the whitelist clearer
Merge branch 'master' of github.com:dimitri/el-get
Merge pull request #836 from tkf/more-whitelist

Add more properties to el-get-status-recipe-update-whitelist
cached sounds
That should allow people to define a file to include when they add a function to a hook

Signed-off-by: emanuele <emanuele45@gmail.com>
add/remove_integration_hooks needed a bit of checks...

Signed-off-by: emanuele <emanuele45@gmail.com>
Also non-OOP developers want to include files! :P

Signed-off-by: emanuele <emanuele45@gmail.com>
Should be possible to include a file with hooks even using the <hook> tag

Signed-off-by: emanuele <emanuele45@gmail.com>
Three formatting changes from marcus in license, version and title presentation

Signed-off-by: emanuele <emanuele45@gmail.com>
Better check if the files exist unless we want the logs full of errors :P

Signed-off-by: emanuele <emanuele45@gmail.com>
Fixed somehow the integration hooks report to support file inclusion through hooks

Signed-off-by: emanuele <emanuele45@gmail.com>
I still think that the possibility to disable hooks should not be active by default...added it as core feature (the list is still displayed by default though)

Signed-off-by: emanuele <emanuele45@gmail.com>
[integration hooks report] And added the check if the core feature is enabled also to the saving

Signed-off-by: emanuele <emanuele45@gmail.com>
Files to include are optionals

Signed-off-by: emanuele <emanuele45@gmail.com>
Few fixes for enable and disable hooks

Signed-off-by: emanuele <emanuele45@gmail.com>
Let's keep only the 3 include present in SMF 2.0, all the others would be pretty useless

Signed-off-by: emanuele <emanuele45@gmail.com>
Fix ejscript.bit probing.
Fix bit usage
Cleanup
Refactor http auth file/pam
Added Expenses

Updated budget.
change editor for git to vim
tarefas repetitivas que caem em final de semana
Add exceptions raised when setting markers fails.
Add `Board.set_marker` and adapt `Player`.

Also adapt the players to use marker functionality.
HtmlHelperExtension
.
More changes to links and verbiage.
added package task
fixing broken tests
completed match details migration
Added X offset

When ball is < 100 or > 500, the X offset will be decreased or
increased.
This will give the impression of the world scrolling to the left or the
right
specification of the persist api with an acceptance test
new persist api to select which part of the graph need to be persisted
changed the title attribute of Fragments to specTitle avoid implicit conflicts
added a notoc argument to prevent the table of contents to be generated
Merge branch '1.10' into 1.10-scala-2.10
New version of env-etu
Cleaned old versions
margin const
Updated CGPartyDaemon
Drop privileges in mock dialback server
Drop privileges if user is set
Refactoring and renaming the project.
fixed description of TNVirtualMachineAgent in API doc
removed unnecessary log of existing commandline
fixed some codding style issues (if/for blocks)
fixed a type (s/hasSwitchs/hasSwitches/g)
renamed exec_iq to iq_exec and added try/catch block
changed order of methods in TNVirtualMachineAgent
renamed exec_msg to msg_exec
using flag in modules section is enough for enabling/disabling xml
renamed entry point of agent running in guest os to runarchipelguest
we don't need TNArchipelGuest to be inheritance of TNTaggableEntity
renamed entity type from guest to vmguest
fixed 2 minor naming issues of archipel-guest
added missing API doc for TNArchipelGuest.iq_exec
extracted executing command from processing the stanza
don't need to set namespace again, buildReply does it
fixed some coding style issues in TNArchipelGuest.iq_exec
we don't have vnc in archipel-guest
changed bin script according to 18bb4b0
synchronised version of guest and virtualmachine-agent
fix metod declaration
huihih
jsbeautify plugins
Latest push correcting for code coverage
Check redirect body flushing
Some more test delays
Merge branch 'master' of git://github.com/snoyberg/http-conduit

Conflicts:
	test/main.hs
httpRedirect flushing
animated characters ! fixed a world loading bug
REST: Set location header for created sectionn + CS fix
REST: Remove deprecated todo
Fixed: Rudimentary stub for ezuser FieldType.

This adds a very simple stub for the User FieldType, which needs
implementation.
Align Legacy TrashHandler methods implementation to corresponding interface
Fixed ezcontentobject status flag not set to "archived" when a location is moved to trash and no other location is available
Fixed some phpdoc
Fixed typo in phpdoc
Implemented missing trash handler methods.

TODO : tests
Improve Windows support

Test Plan: Display stacktrace in Phabricator, verify that filenames are links.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran

Differential Revision: https://secure.phabricator.com/D2131
fix: added some changes to make the FSI runner work for void statements
Fixed rather major spelling error
Merge branch 'development' of https://github.com/farhanrahman/kyoto into development
Added TradeTest simulation and TradeTest launch file
Changes in Changes in reading fossil fuels prices
Changes in FossilPrices: now returns -1 when there are no values for certain year. This is to avoid unsafe comparison of potentially very small doubless with 0, which could erroneously return true. Changes in AbstractPostCommunistCountry to reflect the change
Additions in BIC countries behaviour
Country constants added
Remove a function
Problems with commits
Remove BIC
Replace BIC.java
Merge branch 'development' into testtrade2
Simulation not working at the moment....
Changed TradeHistoryImplementation to take care of null pointer exception
Testing TradeProtocol
Latest update
Green lands
Now it should be even better
Merge branch 'development' of https://github.com/farhanrahman/kyoto into development
fix update publications
Bug Fix: Loading policies with the new OrBAC API
Corretti alcuni errori e finito di tradurre
Launcher è lancio?
Update moe.bannerSlider/slide.js
ultimate le neighborhood con test

i vecchi test sono da riattivare e verifcare
making the main app's helper methods available, in order to be able to use the main app's layout. See: app/controller/workflow_kit/application_controller.rb
Chocolat APIs
Merge branch 'master' of github.com:fileability/taskit
refactored everything, seperated via files, shared code for client and server
FIX WS Tests
Working on send xmpp message after save operations on tree
Merge branch 'shared-projects' of https://github.com/geosdi/geo-platform into shared-projects
REF GeoPlatformService#updateAccountsProjectSharing: the Account owner ID relation must be present, otherwise the Project will be unshare
REF Optimize Project loading
REF Minor
FIX NetBeans fail the rename refactor
REF Disable user option view on save success
FIX Null when retrieve if project is default
FIX Reset default project when save new project
Fix conflict
REF Comment service call for progress bur hide in sharing project
REF Rename properly client method for save Viewports
REF Minor on Viewport service
Merge branch 'master' of https://github.com/geosdi/geo-platform into shared-projects
Merge branch 'shared-projects' of https://github.com/geosdi/geo-platform into shared-projects
Fixed problem on hiding status bar after adding layers on tree

Added code to send message notifications

@vixgeo: Check the notification invoice and receipt
FIX Problem for Printing Only Layers with Parent Checked
Improvements for MediatorToolbarTreeAction
REF GeoPlatformService#sendSharedProjectNotification send the message only if the possible recipient have the project target as default
Merge pull request #35 from geosdi/shared-projects

Shared projects fix bugs
FIX Bug on save new project as default: put into session new project ID correctly
REF Minor
Update for stable branch

Change-Id: I028eed58c3fd9c1584a70910c124357b17fe602a
Merge remote-tracking branch 'upstream/jellybean-stable' into jellybean

Conflicts:
	default.xml
UpdateAPI v1.0
dont use an option-parser to handle actions
add edittext for input and send button
hi.
I'm yeojoy.
add adapter & data model
finished generating all 5-card ranks
update metadata after download
Update _posts/news/2012-08-13-test-article.md
Updated NbtFile to override ToString
Merge pull request #1 from SirCmpwn/master

Updated NbtFile to override ToString
New install. It creates new vimrc and bashrc with source to dotfiles equivalents. It also links gitconfig
Validación de orden en respuestas
Agregado de datos en fixtures de proyectos
Actualización test de unidad de proyectos
Actualización test funcionales de proyectos
Migración índices en instancias de respuesta
Migración índices en instancias de proyecto
also translatet the Sensor-file into it's literate verseion
version 0.2.0.0

* module moved: FreeGame.* -> Graphics.FreeGame.*
* added mouse input
meh
criteria into it sown function
add bookmark id field
remove id.root since we dont use that
make comments filter more specific
oops
add construction obj to events
make fields positive, not negative
add root back in
Added more error handling

Added more error handling to insure that if boot-update mounts /boot it
unmounts it before exiting regardless of outcome
Fixed auto mounting for scan feature
This commit reverts c5c7e9f91ea66198114763e36a37a128b12223bb.

This fix isn't needed anymore and now causes an error by naming module
part_part_msdos
Fixed kernel path for scan feature
Small tweak to unmounting function
Generate boot entries in same order as config file.
Merge branch 'release/bugfixes'
Make boot-update compatible with gentoo's grub2
Move hard-coded data to a config file
Move lilo data to config file. Add alpha support for other OS.
More work on lilo. Consider it BETA quality now. Needs more testing.
Merge branch 'feature/lilo_support' into develop
Made code more py3 compatible. Converted some comments to docstrings.
Various other fixes,changes,ect..
Fixed accidental paste
Turn on shell in testing to allow use of /dev/null
Finish py2/py3 compatibility
Modify testsuite for py2/py3 compatibility
Merge branch 'feature/python_cleanup' into develop
Update docs
Added support for Haiku OS
Avoid StringBuilder use for parsing and avoid Scala tuples
Fix all date related strings.
Correctly handle comments.
Install google analytics.
Pushing out changes from work machine

Updated the machine to 10.8, pushing out the local changes.
Second attempt at fixing proxy problem
Wrapper around package provider with hold and oldconf support
added initial parser
Merge branch 'master' of github.com:gclark916/CS132HW2
thanks to martin for his contribution
Fixes and Readme.
Tweaked powerline
Clarifying some of the language in the assertion and certificate generation sequences
Extended cache file method.
sync with gx86

(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)
fix typo in intel-sdp_pkg_pretend
utf8 encoding converter
Merge branch 'master' into android-1.5
Update notes for submitted changes

* Debugging hack for bug 38273
Update notes for submitted changes

* Debugging hack for bug 38273
Update notes for submitted changes

* Update jQuery to 1.8.2
Update notes for submitted changes

* Fix an issue with the data-sort-type retrieval.
fix vertical alignment of invite/search row
small optimisations to blockSnoc and blockCons
add mapFilter
Update vim git plugins
Update README.md

add MIT license, Usage and Description
don't need sweepers with key-based caches
get rid of entries sweeper
Small fix to avoid JS crashes
Take advantage of ActivityObject#comment_count to save some queries in wall
Fix deprecation warning on Thread connection close
new icons
Merge branch 'bootstrap' of github.com:ging/social_stream into bootstrap
Fix comments watermark and comment link after new timeline entry
fix a bug desrcibed in 2291a7a809
models: use new connect style
datagraph: use new connect style
Deleted SBJson files cause I change to use native json parser.
posts forms
first checkin, adding java src files for UnitName
saves cache (reduces disk thrashing)
recompiling 2 more ops (LWL / LWR)
saves cache refinements
Changed readme to rt filetype and changed text.
Placate Perl Critic wining about an eval
v0.016

	Interpolate environment variables in the whole ACL
	specification for check-acls.

	Make the .pl extension optional in configuring plugins.

	Make im_memberof an exported routine of Git::Hooks.

	The group specification is now given by the githooks.groups
	variable. This is an incompatible change, since previously it
	was given by the check-acls.groups variable.

	Implement Git::More::get_affected_files. This routine returns
	a hash mapping every affected file in a sequence of commits to
	a letter telling its affected status.

	Allow check-acls.userenv be given by a code snippet to be
	evaluated.
Added first usable version of profile pages
Update app/works/snippet_highlight.rb
cleanup
some basic metric parsing
* don't add a thousands separator in FormatFloat if there are no digits
   before it because the value is too small, regardless of what the format
   pattern sepcifies (patch by Bart Broersma, mantis #13076)

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23095 3ad0048d-3df7-0310-abae-a5850022a9f2
  * enabled commented out test

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23096 3ad0048d-3df7-0310-abae-a5850022a9f2
compiler: add US-ASCII codepage

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22419 3ad0048d-3df7-0310-abae-a5850022a9f2
* don't write '.section' twice for stubs on Darwin/ARM

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22432 3ad0048d-3df7-0310-abae-a5850022a9f2
* formatting

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@20697 3ad0048d-3df7-0310-abae-a5850022a9f2
* make use_fixed_stack for i386 more generic (any target with more than
    4 byte stack alignment needs a fixed stack)


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23043 3ad0048d-3df7-0310-abae-a5850022a9f2
allow per plugin config for table name prefix
use release plugin 2.0.1
update to 2.0.2. Fix for GRAILS-9111
Merge branch '2.1.x'
ok decided to trash the whole idea.  Going to accept it for what it is
Fix mapping.
Don't explode when seeking to bogus locations.
Added alternate stylesheet for faster selector performance.
Implemented most of SimTime class.
OOZIE-1135 Display missing partition dependencies via job -info command on CLI (mona)

git-svn-id: https://svn.apache.org/repos/asf/oozie/branches/hcat-intre@1426607 13f79535-47bb-0310-9956-ffa450edef68
Made installing/uninstalling chat box easier

scripted chat box preference file, made scripts for install and
uninstall.
build tweak - minor change to make it work with JDK5 (not important these days but no harm done)
[Update] Recreate Database Please
Merge branch 'master' of github.com:guanyilun/eManager
fix: web bbs user interface
Initinal Commit

Signed-off-by:  <Niels>
admin block of open_uses unfinished
Add current time in HHMMSS format to bash prompt.
python block gets same signature extend logic
Linha do tempo Metodos
add image

Signed-off-by: Hake Huang <b20222@freescale.com>
2012.10.13/2
Signed-off-by: HalFtaN <half.a.tan@gmail.com>
Fixed minor typo.
Merge pull request #69 from uvtc/master

fix minor typo
Revert "- perbaikan pada penampilan data parkir, jika biaya == null akan ditampilkan pada formparkir - perbaikan pengurutan penampilan data pada form rekap"

This reverts commit 5cbbb0d4ce712f961dfbdf5dd3c395b3a38ac435.
- perbaikan pembagian form jaga masuk dan keluar
- perbaikan pembagian form jaga masuk dan keluar
- perbaikan penamman form
- perbaikan pembagian form jaga masuk dan keluar
- perbaikan penamman form
- perbaikan pembagian form jaga masuk dan keluar
- perbaikan penamman form
- perbaikan pembagian form jaga masuk dan keluar
- perbaikan penamman form
-almost
-almost
-almost
-almost
-almost
-almost
- penambahan border
- pembetulan buat pengisian biaya
- penambahan dispose() buat efektifitas memori
Change tests for new /api path prefix.

We plan to merge the static web server with the API server, so we'll
prefix the API URLs with '/api'.
Add /api prefix to API URLs

Prefix the API URLs with "/api", so we can use the server to serve
static web content, too.

Make sure we don't create multiple connections to the Postgresql geodata
server.
Add tests for static sites

We'll serve the static apps for the mobile client and the desktop
browser client from this server, so we need to handle those URLs.
Test static routing against direct S3 content

Compare the file returned from the static routes with the file returned
directly from the S3 URL.
Handle S3-hosted static web apps

Upgrade express.js to support newer versions of node.
Add connect-s3 middleware for S3-hosted static sites.
Tweak locally-hosted static routes to use a middleware functionality.
Switch to slaskis/knox, which has updates and fixes the large test file
issue.
Update to work with express 3.0

Pass express app to node's http.createServer.
Implement the text/plain JSON parser as middleware, rather than as an
extension to the bodyParser middleware.
Make sure we cleanly start and stop the server, which happens several
times in the tests.
Add a mobile form, check for created date on forms
Modify forms test to support a mobile form
Merge pull request #15 from codeforamerica/merge-server

Merge static web app servers with API server
More tweaks to form tests
Merge branch 'master' of github.com:codeforamerica/survey-api
Fix variable name
Add mobile forms to the tests
user twitter.com as legacy name
Better error message when backends can't be started
some notes
more references
added typechecking
Merge branch 'master' of github.com:hardselius/cpc-dsl
added xml-generation option
So unit tests and composerified. Almost done for a release
Fix for richtext editor.
remove all plugins, to re-add as submodules
re-add vim plugins as git submodules
put swap and backup files into .vim
add leading underscores to swap/backup dirs
Tree View Center On Node
Added work units

Each task has a number of work units, each of which has a weight. The amount
of work that that task does is proportional to the weight.

The number of work units and the range from which their weights are generated
(using a uniform distribution) can be specified at the command line, e.g.
they're runtime configurable.
add
GetModulePath function
Add hack to make import of txtorcon work
using mixins,etc now
added cucumber test for selectors
Simpler logic for main
Splitting up logic
Removed all dodgey error handlin
handle post requests
First 'commit'

Signed-off-by: Herewego Dev <dev@herewego.co>
调整 xapian-scws 接口并支持 xapian-1.3.x
Fix errors in speech an slides
Site updated at 2012-10-27 05:25:21 UTC
Remove -e file
Deduce --file with --class if not present.
[auto] Merge from Test

    • #00a7a5e — Deduce --file with --class if not present. (Ivan Enderlin, 2012-09-30)

---

Merge remote branch 'library-test/master'
Add PHP_INT_MIN constant.
[auto] Merge from Core

    • #4ecccf2 — Add PHP_INT_MIN constant. (Ivan Enderlin, 2012-11-02)

---

Merge remote branch 'library-core/master'
Remove preference for disabling relay overrides

git-svn-id: http://kolmafia.svn.sourceforge.net/svnroot/kolmafia@10899 b29ace70-8910-0410-8dcc-aa2fc6433167
oo
o
Merge branch 'master' of https://github.com/hongjingyuan/study.git

Conflicts:
	README.md
Tweaks to the runner.
10.22  edit loan 13.11
Merge branch 'master3' of https://github.com/hoyoji/HoYoJiMoney.git into master3
10.22  to change the deffered of addnewsubmit and editsubmit  16.30
10.22  to change the deffered of addnewsubmit and editsubmit  16.30
fixed extra spaces in toolkit, this broke configure scripts using e.g, case  in 'icc' foo
Merge pull request #258 from JensTimmerman/toolkit_fix

toolkit bug fix
[fix] fixing non-cacheable github interactions - not using cache for those.
Included username field in users table
points json
scrapButton
merge
Refactored repeating font setting code.
need some more exception handling
optional matplotlib
Inject database into RelationshipSpecification
Removing unused parameters.
Deleted files.
Inject TargetNodesSource into TargetNodesStrategyBuilder, instead of inheriting from it.
Using NodeCollection where I can  instead of NodeIdCollection.
Nearly  there with consolidating on NodeCollection.
Deleted NodeIdCollection
Cleaning up further.
Adding simple statistics
Improve tabular key bindings
fehlerbehandlung wenn kein bild vorhandne ist
Merge branch 'master' of github.com:ikusei/Goldencobra
?? sollte sein &&
chosen nach jquery
	modified:   config/initializers/active_admin.rb
help & survey answer edited
version task
Handle absence of arguments
maltese, hungarian: final, please do not touch
[ticket/10537] Removed u_pm_delete permission

PHPBB3-10537
[ticket/10537] Removed f_print permission

PHPBB3-10537
[ticket/10537] Removed u_pm_printpm permission

PHPBB3-10537
[ticket/10537] Removed f_subscribe permission

PHPBB3-10537
[ticket/10537] Removed unused u_pm_emailpm permission

PHPBB3-10537
[ticket/10537] Somehow permissions got added back; now removed again

PHPBB3-10537
[ticket/10537] Removed u_pm_forward, merged with u_sendpm

PHPBB3-10537
[ticket/10537] Removed u_pm_download, some places merged with u_download

PHPBB3-10537
[ticket/10537] Removed u_savedrafts, using f_post/f_reply, u_sendpm/u_pm_reply

PHPBB3-10537
[ticket/10537] Removed a_jabber, merged with a_server

PHPBB3-10537
[ticket/10537] Forgot a language entry

PHPBB3-10537
[ticket/10537] Removed faulty anonymous check from changed logic

PHPBB3-10537
[ticket/10537] Fall back on u_download after removing u_pm_download

PHPBB3-10537
[ticket/10537] Fixed improper conditional after removing u_pm_download

PHPBB3-10537
[ticket/10537] Removed unused language entry

PHPBB3-10537
[ticket/10537] Fixed syntax error caused by typo: $auth->acl-get. Oops.

PHPBB3-10537
[ticket/10537] Remove the permissions upon update

PHPBB3-10537
[ticket/10537] Use sql_in_set() once per table in database_update.php

PHPBB3-10537
[ticket/10537] Remove usage of u_pm_download, fallback to u_download

PHPBB3-10537
unique validator
Merge remote-tracking branch 'origin/master'
changes in attempt to run roxygenize() to produce R docs ...
Doesn't seem to produce anything but doesn't complain either...
Strange...
Aha. building mans works now.
small cleanup of redundant copying during R assembly
Don't use boost.system after all. (1.51)
Revert "Don't use boost.system after all. (1.51)"

This reverts commit 8ce8ed5edba37a5dd51aaf8a755d97b0728b6a0d.
Add built parts of boost.system.
Delegate some response methods into resource
access resource by attr
Let json handle unmarshal content
Fix json resource
For OAuth  sincronous request, try to sign again when no credentials has been set up yet on AuthErrors
Allow to assign a callback directly to properties intead of use ask_to methods
Allow Client subclasses
Allow full uri's on client API declarations
Add support to renewable tokens on oauth
Tread HandSakeError as a non http one
Allow to modify inplace response values fetched from response
Return utf-8 content from json data
Add patchers to allow to generate valid docs based on content-type
Allow stream content to be pased to Json marshaller
Add diff support to response
Let json converter to also handle json-path files
Remove magic code to handle multipart files
Add body arg to request to allow sending arbitrary content on rest calls (post/put)
Support stream based bodies
Workaround a possible exception
ie fixed partially
Template replacer in build system now
Changes CellReference
Prepare to profile downsample wo transfers.
Put downsample rate back to 2.0f
Ran downsample for standard resolutions.
Comments on Backbone ^_^, ready adding report
Updated Qunit dependency to QUnit 1.7.0.  QUnit now supports node.js out of the box, so I was able to remove some sandboxing.
Workaround for distutils that keep printing cleanup statement.
Eclipse files were added
[SchemaComparator] Add AbstractAssetDiff
完成destroy的逻辑
Move the release_adsr/break; code to the appropriate loop.
Include provisions for not processing mono samples as stereo.  TODO:  Stop allocating memory for them twice.
Various fixes and improvements to the bus tracks...
Fixed a regression with copying and pasting items in a region with CTRL+C/X/V
update example with GwtChosen 1.2.0
added D&D for appliances
Merge branch 'prog_week' of github.com:jack-kerouac/RoomR into prog_week
Merge branch 'master' into multiplayer
Merge branch 'multiplayer' of github.com:jackdbernier/cubyq into multiplayer
CALISS
mesages
Merge branch 'multiplayer' of github.com:jackdbernier/cubyq into multiplayer
增加产品仓库列
Excel2003 ==> Excel2007
# WARNING: head commit changed in the meantime

# WARNING: head commit changed in the meantime

# WARNING: head commit changed in the meantime

Incomplete - task : Live Shows Project
Added missing vacation-high++ benchmarks
Fix IE9 problems.disabled="" causes mouse hover to show stop sign.readonly="readonly" also causes hover to show stop sign.
fix support for command line args @ARGV not @_
Merge pull request #2 from dlbewley/master

Merged. Sorry for delay. =)
Black background + better transition to stone + air
fixed compiler errors
fixed compiler warnings
moved some functions to enums
more errors and warnings
Merge pull request #5 from honkdamonk/java_conversion

Java conversion
Added edge list graph reader.
Reading of edge values missing
Moved gm_edge_list_reader to clean up the gm_graph class
Added storing of node/edge properties on disk to gm_edge_list_reader
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl
refactoring -> cyclic dependencies are ULTRA ANNOYING!!!
closing in/outstreams only if they are open
code for loading properties rewritten
added code for comments
reading properties from file works
removed unused class member
small refactoring
Added reading and writing of boolean values
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl
misc
Added error detection
Refactored error handling
misc
Initilizing properties with 0-values
Added graph building
Added graph building
Removed useless checks/errors
moved methods
removed useless String allocations
moved methods and global constants
deleted unused stuff
deleted more useless stuff
moved global variables
deleted useless class
changed LinkedList<gm_rwinfo> to gm_rwinfo_list
misc
misc
move former global functions where they belong
moved things where they belong
move things
reduced visibility
moved gps constants to gps backend
misc
Merge pull request #25 from honkdamonk/java_conversion

Java conversion
Fixes for consistency.
updated graph UI
added asteroids and game networkng
Update player locations
minor tweak for node.js support
Merge branch 'next' of github.com:jbaicoianu/elation into next
Merge branch 'next' of github.com:jbaicoianu/elation into next
Merge branch 'next' of github.com:jbaicoianu/elation into next
use config option for tracking.enabled
hide notices by default, only run Conteg if not a redirect
Merge branch 'next' of github.com:jbaicoianu/elation into next

Conflicts:
	components/html/templates/header.tpl
Merge branch 'next' of github.com:jbaicoianu/elation into next

Conflicts:
	components/utils/scripts/elation.js
working out kinks
working on function
deploys new Coldbox instance
add JSMin locally
add ORM generator
Changed formatting, added diagrams
Added image files
/ ‘Safari/History.plist’
+ ‘Safari/.dat04ac.081’
added apache links normalizer to htmlparser test. now it works.
added support for finding links in embed[src] and input[src]
Merge pull request #3 from xaoc3dgraph/dev
Refactored unit selection by mouse so that the double click and drag
select logic is in its own isolated unit.
vs2010 project updated
Added clean_paths
update up_key to check whether or not a key handler is present in the code before processing
Sentidos listo
Make Time->DateTime and DateTime->Time typecasts retain fractional seconds on ruby 1.8 (Fixes #531)

On ruby 1.9, the typecasts just use Time#to_datetime and
DateTime#to_time, but those methods aren't available in ruby 1.8.
On ruby 1.8, a conversion is done through string, but that wasn't
including the fractional seconds.  Manually include the fractional
seconds for both type conversions on ruby 1.8.