labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' of https://github.com/BootcampHTML5/Equipo-3.git
Router corregido
tiwwtview
Cambio iconito borrado. quito followers.js que no se usa
Should have everything up until the sending and receiving part done for sender.
Added code for making Django TinyMCE work with inline- admin models
Signed-off-by: Andrey Lurye <alurye@gmail.com>
[logstash] add logstash cookbook and its dependencies
Merge pull request #2 from ClarenceAu/master

merge
modify the structure of file, add module dir to store the module js files for this project
Merge branch 'master' of github.com:hafeyang/baiduhunter
little modify
fix bug
add underscore
basic report generation complete
update template
by-yhf
Merge branch 'master' of https://github.com/hafeyang/baiduhunter
fix bug
update by clarenceau
update by clarenceau
update by clarenceau
by-yhf
Merge branch 'master' of https://github.com/hafeyang/baiduhunter
update by clarenceau
Merge branch 'master' of github.com:hafeyang/baiduhunter
update by clarenceau
update by clarenceau
fixed wrong !
fixed indent problem on nested lists
fixed iOS 6 attribute crash
moved setup related utility modules to a setup_tools package
Merge remote-tracking branch 'origin/master'
Delete by ID now work with the exact ID

This avoid issues when the id contains special characters (used in the solr query syntax)
Added more of edmunds vehicle api methods
fix for hipchat notifier, sb bump
fix for post_share_dialog finish_path, make oops dialog prettier
Adicionado item 2883 no item_db
Merge branch 'master' of github.com:Cronus-Emulator/Cronus
Updated DB, Updated Web Service
LibTCOD's source code is now in the repository and will be compiled as part of the toolchain.

For Linux, this means there are additional dependencies on having the development headers of libpng, zlib, SDL, OpenGL and X11 installed.
LibTCOD's source code is now in the repository and will be compiled as part of the toolchain.

For Linux, this means there are additional dependencies on having the development headers of libpng, zlib, SDL, OpenGL and X11 installed.
Fixed jdiez's issues with VM screen not working in debugger.

Fixed SDP references where they shouldn't exist (they weren't #ifdef'd).
Use 'attach hardware lem1802' to attach the screen hardware before running.
Merge branch 'libtcod-src' of github.com:DCPUTeam/DCPUToolchain into libtcod-src
Updated Windows to use provided libTCOD binaries.

GCC on Windows / MSVC is hard to get LibTCOD to compile
because of the huge amount of dependencies, so now on Windows
it will use the precompiled binaries and everywhere else it
will compile it as part of the source tree.
Cleaned up unneeded Windows references in the libpng, opengl, sdl and zlib third-party projects.

Added missing inclusion in emulator/main.c that prevented compilation on Windows.
Merge branch 'libtcod-src'
Fixed a stupid mistake
Merge branch 'master' of github.com:DCPUTeam/DCPUToolchain
Fixed header conflicts in Windows builds.
Adds link to noir in README.
Adds inital code for better dying checks.
Use triggers to determine if player won.
Add new method to scale provider and change ticks provider method
Non-Recursive projects: fixed automatic refresh - no need to press F5 to
hide > second level children
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-ui.git
non-recursive projects: clean-up
Nas updated (first)
Using pics
Test word update
no idea :-(
Delete rails image
Add compass and bootstrap
Fix asset compiling for production
Add public/assets und sass-cache to ignore list
Add a simple layout to make things look nicer
+ [SRC] Added ASIHTTPRequest Classes
* add necessary icons
Fix: IronChest Donjon
Document-listener zusammengefasst
Document-listener zusammengefasst
Pridana pravni cast KWIC paperu
Merge branch 'master' of github.com:DominikMostek/A7B36ASS
Fixed syntax errors in issues.tex
Merge remote-tracking branch 'origin/master'
Added some to designing user interface
Added Time input to the file
Ignorierte Dateien hinzugefügt

Signed-off-by: Duncansin <pic-man@web.de>
WIP for bootstrap.
Site updated at 2012-12-03 22:28:55 UTC
fix setting.html
Added winners to listings ending soon in bootstrap data
Merge branch 'master' of github.com:EdgeCases/BitterBidder
Libraries shouldn't carry a Gemfile.lock
Declaring dependencies in the Gemfile saves us from all sort of duplication and circular reference goofiness in the gemspec
:_remove_index and :_update_index callbacks are unnecessary as our models already carry sunspot's standard :perform_index_tasks, and :mark_for_auto_indexing_or_removal callbacks
Option to use OpenGL JUST for the interface
move old cv to 2011 dir, create new 2012 dir
CV updated
*Fixed a bug from the refactor that would cause the codez to break.
* Tweaked log4j pattern
Test y validaciones
Forgot to include path of the suppression file location.
'Clid' really shouldn't be filtered out there....
Made chats and broadcasts not produce error messages.
Re-added 'Clid' to be filtered out, because here it actually is
necessary.
added octopress snippets for markdown files
added pullquote snippet
add one more snippet for junit 4 with @Test support.
Merge pull request #103 from leandromoreira/patch-1

add one more snippet for junit 4 with @Test support.
little refactoring over the test for junit4 and previous version
Merge pull request #105 from leandromoreira/patch-4

little refactoring over the test for junit4 and previous version
Added erlang fun snippet (anonymous function)
Added erlang try snippet with a catch-all
Added OTP gen_server template following normal conventions
Added OTP application template following normal conventions
Added OTP supervisor template following normal conventions
Merge pull request #106 from tormaroe/erlang

Erlang snippets
Fix mismatched closing tags for h3
Merge pull request #107 from smt/master

Fix mismatched closing tags for h3
Merge pull request #100 from ngquerol/master

Added snippets for Octopress
Merge branch 'master' of https://github.com/honza/snipmate-snippets
Support nested bind
Now uses Detector.js to detect WebGL compliance.
Tidying things up.
- Cache folder location fix;
- timer restarts after fetch fail.
oui,non,oui,nan on oublie pas le index cette fois tavu
cdata device driver add semaphore.
Server does not have to be provided in the doCallSoap function
Another set of fixes on event views (& permissions).
Added attendees in sidebar & fixed remote media.
Changing README format.

i.e. I'm playing around.
Updated version to 11192012
Merge branch 'dev-cs' into integration
Merge branch 'dev-cs' into integration
Updated versioning
AUTO-322
Merge remote-tracking branch 'origin/integration' into dev-cs
fix for AUTO-251
AUTO-341 WIP
AUTO-414 Add Company and Content Category fields to account registration page
CopyRules completed
næsten slut
done some work on the AI, will have to read changes to see what
changed window call to SFML 2.0 style (sf::window to sf::RenderWindow) so that character.draw works. and done som work on the charater constructor
changed window call to SFML 2.0 style (sf::window to sf::RenderWindow) so that character.draw works. and done som work on the charater constructor v2
Added copyright notice to all files

	modified:   src/Includes.hpp
	modified:   src/classes/Character.cpp
	modified:   src/classes/Character.hpp
	modified:   src/classes/CharacterFactory.cpp
	modified:   src/classes/CharacterFactory.hpp
	modified:   src/classes/Menu.cpp
	modified:   src/classes/Menu.hpp
	modified:   src/classes/Mine.cpp
	modified:   src/classes/Mine.hpp
	modified:   src/classes/MineFactory.cpp
	modified:   src/classes/MineFactory.hpp
	modified:   src/classes/Node.cpp
	modified:   src/classes/Node.hpp
	modified:   src/classes/NonPlayerCharacter.cpp
	modified:   src/classes/NonPlayerCharacter.hpp
	modified:   src/classes/Player.cpp
	modified:   src/classes/Player.hpp
	modified:   src/classes/StackNode.cpp
	modified:   src/classes/StackNode.hpp
	modified:   src/classes/Tile.cpp
	modified:   src/classes/Tile.hpp
	modified:   src/classes/World.cpp
	modified:   src/classes/World.hpp
	modified:   src/main.cpp
Update SMTP deprecations.
Finalized design, added website URL, re-plotted gerbers
Read me spelling... 2
Read me spelling... 3
Field Nodetree now handles publication hierarchy.  Reworked all of epub
for this.  Fixed handful of errors too.
Finish up Level things
Configured the project to use Java 6 as the build environment
Fixing typo pointed out by @sxtxixtxcxh, thank you !
changed a lot. it's getting better
Fixed issue with new user, fixed issue with database migration.
Add httpserver ready binary.
Add the readme cleanup and better configs (plus a few new console commands "money set", "money get", "money add"). Make it easier to setup Stardust.
NOTE: Only the httpserver branch version is in here now.
More changes for http branch. Stardust now takes advantage of the new connectorBaseG2R class
Routine commit.
Attempting to solve a conflict.
Expansions for obj-c method calls
bug fixes and tests
Merge branch 'master' of github.com:JasonRowe/MortgageCalc
whatever
Merge branch 'master' of https://github.com/Jeremy-Gaillard/TPCIAI
continue à réorganiser le bordel
Merge branch 'master' of https://github.com/Jeremy-Gaillard/TPCIAI
Merge branch 'master' of https://github.com/Jeremy-Gaillard/TPCIAI
fini de tout réorganiser, mais apparemment faut que je commite avant de puller... donc tout va foirer.
FFFFFFFFFFFFFFFFFFFFFFFF
FFFFFFFFFFFFFFFFFFF2
Merge branch 'master' of https://github.com/Jeremy-Gaillard/TPCIAI
Merge branch 'master' of https://github.com/Jeremy-Gaillard/TPCIAI
makefile devrait marcher
message erreur correct
finish to refactor with new property obj.
AutoSync to WoW-Pro.COM on Sun Dec  2 17:46:49 EST 2012
removed 'fork me on github' banner
Add exit door to tileset, add to level.
a few corrections in instruments_de.xml
what do you want from me + I removed chosen
Revising Lightning Talk and OSS Plan for new API
更新Brands菜单项，使用listall和addnew作为标准的方法名称
改成正确的目录名
添加品牌的数据成功
第一次导入paginations
改成英文的
导入更全的cke css
完成了list all 和publish两个功能，加入了paginate
使用最新的MsgHelper
加入和msg helper有关的js
忘了
Add synchro exception error fields
Removed the require, bump
it's klass_name and not klass, avoid nil there
CSRF token to be passed during ajax calls
Adds further testing for server responses
Installing pytee's modification of MPlayer
Correction: omnomnomicon.org
Lockdown timer of 2 seconds was too long.
Current guide display of profession was splitting on spaces instead of semicolons
Current guide display of profession was splitting on spaces instead of semicolons
Current guide display of profession was splitting on spaces instead of semicolons
Get rid of dead code and make the logic for dalies reset more robust.
remove the profession quests skipping logic to the Broker.
remove the profession quests skipping logic to the Broker and add LVL handling for non-L steps.
Update the profession quests skipping logic to be based on the Professions module, but with the dalies and leveling generalizations.
Sync to WoWPro.
Update Guides.xml to pull in new guides.
V 2.2.4
odds evens
Initial commit of static templates
Change to Home.psd, minor adjustment
Add missing import of the `format/3` predicate to the XSB-MT integration files
Hotovy find set tool, par drobnych uprav simulaci/sceny.
Further improvement of layout
fix huangjin ai bugs
Signed-off-by: Lycio <Lycio@vip.qq.com>
fix a ChangbanpoRule
Signed-off-by: Lycio <Lycio@vip.qq.com>
Additional logging to console
HTML1
homework 8
Re-adding backgroundColor to the jumbotron config
Remove not-yet-implemented fields from device form
Forget password implementation
Adding auto-dividers to non-native-select (2)
fixedToolbar.js: adding spaces pre/post brackets
Some new bytecode compiling
Towards primitives in new VM
put toSC in the right place
Lazy and IO primitives in new rts
Different approach to bytecode
Mark tail calls
Add PreC, for an imperative intermediate form that should be easy to generate code from
Fix local names in primops
Local references are relative to top of stack
Started C generation
Output C file (not finished...)
Hook up new output; deal with exact calls
Syntax rules need to allow implicits
Added binding form to syntax rules (and updated tutorial accordingly)
Merge pull request #28 from MekeorMelire/master

Mistake in tutorial
added replicate
added repeat and replicate
added hyperoperation sequence
Se elmina el main
Full support for decimals.
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Merge branch 'master' into develop
Transitive foreign keys.
Cleaned up the core a bit.
Whitespace cleanup
Compiled
cane & reek pass"
Merge branch 'master' of github.com:dkaufman/feed_engine into cane
removing assets
merge resolved
STOPw TWITTERgit add -Agit add -Agit add -A
Merge branch 'master' of github.com:dkaufman/feed_engine
Fixing test
Merge branch 'master' of github.com:dkaufman/feed_engine
Fixing all growl pull on home page
Fixing broken tests
Adding trending topics
trending topics
Fixing subdomains
Removed extra migration
Cleaned tests
fixing changes
resolving merge conflict
Résolu des bugs graphiques pour les commentaires.
MRA:
added multiaccounts dialog

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@1631 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Gadu-Gadu protocol: account avatar work
- fixes with groupchats support
- fixed import/export contact list to text file
- Nick, MyHandle, ChatRoomID stored in db as unicode
(1st step to implement unicode support in GG protocol)

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@2646 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
patch for valid coordinates calculation in tabsrmm info panel

git-svn-id: https://mysvn.ru/ghazan/myranda/trunk@2342 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Make :versionbump visible and use right method

This commit fixes the versionbump task to use the
right version method and adds a description so it
is visible. It also matches on either VERSION or
${PROJECT}VERSION to handle our different cases.
Add and use a util method for commiting a file

Add commit to :versionbump description
output in funktionen outwert und output aufgeteilt
Added an explanation of the NetLogo P2P simulation based off the DEVS Simulation
Added some comments in my code for both NetLogo Simulation
Added some info to the examples text file for NetLogo
A new output class and several new classes added.
Kitsune and Gargoyle updates
Test for valid interface orientation
OCExpectation bumped to v0.3

Submodule OCExpectations 327596b..214ad54:
  > Version bump
  > Expectations not exceptions, typo fixed
  > Shorten the exception reason
  > Import the Eql matcher
  > Includes matcher
  > Catch missing -of:expected
  > Be_within matching
  > Use back ticks for code in comments
  > Rearranged source files to correspond with matcher ordering
  > Open the HTML after compiling documentation pages
  > ExpectationsPages target, not exceptions!
  > Matchers always send -[super matches:actual]
  > Instance-of matcher
  > Short for be-a-kind-of: be-a and be-an
  > Rearranged the matchers
  > Promote sponsors and contributors by one section level
bugs fixed at code generation for for statement
bugs fixed at operator separation
moving var, untyped, and dynamic tests to test repository
adding java2 packages
remove format option
adding new apis to sugar_glue.c
Merge branch 'master' of github.com:konoha-project/minikonoha
update DScriptConsole
Merge pull request #294 from OkamotoYuki/dconsole

update DScriptConsole
fixed diagnosis
fixed module/TraceVM/CMakeLists.txt
fix JSGen module
Merge pull request #296 from tetsurom/jsfix

fix JSGen module
Merge pull request #295 from masakiishii/pull_trace

fixed DiagnosisCheckSoftwareTestIsPass
update module/Diagnosis/CMakeLists.txt
remove old json package
fix strstr bug
Merge pull request #297 from OkamotoYuki/dconsole

fix strstr bug
fix new_kString bug at konoha.string
fix build b288a4
update CountDigits
corrected revnum and some minor fixes
Add pre-processing capability at the service level for provisioning
Merge remote-tracking branch 'origin/master'
changed distributions directory structure
updated assembly.xml to follow the new code structure
#46 Using two screens only to be able to merge a patient
#46 removing unknown attribute after an unknown patient be merged into a permanent one
add module named entity extraction
edit readme
Fixed code inside comments and added permissions for debugging.
Changed default command prefix to !.
add CakePHP
specify versions of deps precisely

NB we should test new libs conservatively and update the package.json
file after testing lib updates
Update static/sites.html

Making the sites page a little more presentable
using Form in blog app
Added some javadoc

Added some javadoc for the classes MaterialManager and TextureManager
1st implementation of Position

Implemented a simple immutable version of the class Position.
Added some simple javadoc
Integrated old work in the new structure

Deleted AppStates, adding InGameState in it's place. Moved Constants to
global package.
Second

Til Klaus.
Suppression de l'ancien contrôleur
Now you can choose the number of publications to show.
Fixed the bug not allowing to display the wanted number of pubs, and then sort them.
- build facebook sdk for Mac with Chameleon
added twitter support
added http/s switching support for Tweets
switched to protocol-less url
using update() to update Stacks now
Hey^^
Added a version of hoverscroll as a jquery-ui plugin, features a bit more functionalities but hasn't been tested thoroughly
19^22
Now using a random available subdomain.
Removed the explicit s0 subdomain addition.
Now using mt_rand. Its faster.
http://www.php.net/manual/en/function.mt-rand.php
Merge branch 'cdn-rc1' of github.com:Rican7/plymouth-webapp into cdn-rc1
refactor for psr1 , psr2
Site updated at 2012-12-12 12:02:38 UTC
JOP40D
bump version to 4.2.1

Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
Merge remote branch 'aokp/jb-mr1' into jb
Changed the way reading of jQuery.
Update PIE.
Fixed: Typos
Added: [Free] signs/Updated: Inventory method
Added: /furnace
Fixed: Self-trading no longer works (/backpack is more efficient)
FIXED: createUser() voteuri and watchuri are not always available. check if node found.
FIXED: finds() further check if element not null
Client (UI) implementation of getTimepoint and getUsers.
JOANNNE: 'remove vrule from header.php to see if it affects pushing middle column down'
Merge branch 'master' of localhost:/home/cisw470p/stu006/express
Added stuff to makefile
removing todo section regarding nonexistant map editor
Nogmaals update gitignore
add fat percentage chart to weight_logs index. todo add milestone of fat percentage.
create migration add column fat_percentage to milsetones
add fat_percentage attribute and validates to milestone model.
write todo comment to weight_log test.
write to test case comment.
add fat_percentage column to milestone model and achieved_milestone model.
Theme Changes - Changed Info file
Corrected a bug related to the change from Facets#ergo to yield.

Signed-off-by: P3t3rU5 <pedro.megastore@gmail.com>
switch dev to mobile-practice-service branch
update versions
First version that might work
[SPC04] Agregado un fix al fichero spell_hacks para ser aplicable con SQLYog. Ya no es compatible con phpmyadmin
Finished control unit
updated configration doc
updated hourly data on cdr overview with aggregation
added text to README
added to .gitignore list
Changed the net event systems

No need to subscribe anymore. Done automatically...
changes in registration_controller
ok
修正聯絡我模組狀態遭刪除容錯
six route issue that prevent creating new auction
basic parsers
Merge remote-tracking branch 'origin/master'
Damage event lines now correctly displays targets
log generation progression bar is now smoother
early work on filter gui
ignore sublime files
initial import of script
comments on whats going on
Merge branch 'release/v0.1.0'
added readme
ignore changelog
Merge branch 'release/0.1.1'
Testing easy deployment to apache
Change to Ruby 1.9 style hash
Auto completer fix
Added first attempt at automatic detection of terminal type. Good results so far but I've not exactly tested thoroughly.
Fixed dissonance between property name and the names of the sets used internally.
Adjusted slightly: award victory if at least 150 control points have passed even if there's no clear victor. That covers the case where a program is just using the generic \n\r sequences, leaving us without a sensible means to award a victor at all.
Hotfix.
Remplacement de la console en application WPF
#7 Ajout d'un systeme qui permet d'associer un handler à un dispatcher.
Différenciation Shared et NonShared handlers (static et instanciés)
#11 Aperçu d'un conteneur MDI
Pushing Images

Images Folder
Update teeko.txt
write message screen done, styles of home page and login screen changed
exp data T
Bump xserver-xorg-video-intel version to 2.20.7
text tic et bouton
Use en us locale.
NFC.
getopt function in gawk
I think it's working.  Just need to build the full circuit to test.
From Redmine-REST-API 1.11.0
Add  Multiple CustomField Support...
Redmine-REST-API 1.11.0
with this JSON it throws an Exception because Multiple CustomField
Values
Fix page main scroller right padding
Add self control in controls constructors
bug fixes
update production log level
update site to not use User.me
Fix ProductRequest when upload document using the URI

Defined account resquests to manage the accounts
Implement AccountRequests

Fix bugs
Even more forgiving search algorithm
NEXT: buff Leech Life, Smog, Drain Punch, Zoroark
Remove a lot of code from the old protocol
Kyurem-B is being suspect tested
NEXT: buff recharge moves, LO, autotomize
Added missing admin function to ensure nodeblocks are shown always
Added background color to text on selection
add: add_printer_owner, delete_printer_owner
initial setup for site
Ich krieg kein Current Object Line 62 SummaryControl
sensor-cpu-proc :
  - Time in states computation is now an optional operation, given by a
  configuration instruction
core :
  - A configuration can now be marked as optional. Thus, absence of it
  will not generate warnings
css tweeks around button position, cancelled punch for now
complete rewrite of PTP
deleted three obsolete translators, fixed tests for two
Merge pull request #355 from adam3smith/cleanup

deleted three obsolete translators, fixed tests for two
oops - commented out sample URL
Merge pull request #354 from adam3smith/ptp

complete rewrite of PTP
Update compatibility
Fix tests
Fix BibTeX mappings outside of Firefox

Firefox supports a flag parameter as the third argument to str.replace(). Chrome, Safari, and IE
don't. This causes data mismatches for some translators (e.g. AMS MathSciNet). The code here will be
less efficient in Firefox, but the speed difference should be mostly negligible.
Merge pull request #357 from simonster/bibtex-mapping-fix

Fix BibTeX mappings outside of Firefox
Update compatibility
Update tests
Integrate intro slide
Initial commit
Pretend 3rd party content
hello world
Merge B project as our subdirectory
Completed Ch. 7 Exercises
added order tracking to overlay layer editor
cleaning up styling for vertical layer editor
better styling for vertical layers, layer forms
style edit.  space after if
fazendo merge dos psd deixando todo layout em um so
Extract the code from the project http://kinsburg.tv/ to django-goto-url
Site updated at 2012-07-22 21:27:27 UTC
initial sync
updating the pom
bumping version
fixed bom versions for both community and enterprise use
adding missing test files
adding tableSuffix
Move package statements below license where necessary and update license excludes
Merge remote-tracking branch 'kborchers/syncing_archetypes' into syncing_archetypes
add properties to the archetype and remove .factorypath
fixing wrong copyright header
not shipping .gitignore
removing duplicated resources
Syncing round 2
syncing qunit tests
fixing hardcoded value
preparing for 1.0.0.M2b release
Initial updates to revert to jboss-javaee-web-6.0 BOM. AEROGEAR-190
moving hibernate version to enterprise conditional logic
bumping version
releasing 1.0.0.M2c
Cantidad Alerta - Funcionalidad terminada (corrección de otros pequeños bugs)
Add a title helper
Add a full_title helper
routing done
Finish layout and routes
fixed testing in prod und staging
basic typescript added
Added documentation via swagger
FIX : support 1d y in MultiTaskFoobar
fluent API for disk setup, code tidies and comments
license and instructions
[maven-release-plugin] prepare release airbrake-java-2.2.2
adding experimental multiple errors in notice
update to next minor version 2.3.1
Remove form-related elements from todo list
Pimp my addition form

Yo dawg, we heard you liked neatly outlined buttons and fading things, but
then properly fast ones, so we just went ahead and dit that.

You're welcome.
Pimp my task list
Corrects name of beanstalk calls
visitor追加
updates
merge
update category
shout page changes
post shout created
Go back 1 appears fully working from here. Needs more testing.
Moved more debugging output into conditional compilation, and disabled most debugging output.
Added third signal, so we can now have 3 concurrent clients. Client exit is now handled more gracefully, the signal is recovered for use by another signal.
A
Merge branch 'master' of https://github.com/wmulligan/networks_proj1
Fixed several incorrect index variables, fixed misc warnings. Reenabled debug info.
Trivial bugfixes
Merge branch 'master' of https://github.com/wmulligan/networks_proj1
added rtt
Go back 1 fully working, fingers crossed
debug
Merge branch 'master' of https://github.com/wmulligan/networks_proj1

Conflicts:
	physical_layer.cpp
Removed debug info again
picture
Merge branch 'master' of https://github.com/wmulligan/networks_proj1
fixed uploads
Cuarto commit cualquier cosa3
arreglo conflict
arreglo por ultima vez el conflicto
french fries site
invoices drawn out
add some stuff
add some stuff 2
Merge branch 'add_some_stuff'
add some code

Signed-off-by: alexjannis <papabommel@googlemail.com>
jaja mehr veränderungen
solve conflicts
super minor upd
Winter is coming!

Now there is a north (on the right) with a snowmans and christmas trees.
And as a usual north, it is really severe. Firstly, it is separated by
mountains from others and secondly, our player (whose castle on the
south) can't stand cold. So it loses hp being on the north.
Sad, right? but not as it seems! As you know world is round. So if
you'll run from the bug having a few hp,  you can survive: there is a
fountain for you to increase hp.
Monk

and noooow we have monk
Welcome your own dog! And some AI bugs fixed.

Dog! I thought Archer is really excess. And it was't interesting for me
to develop it, so I made dog :).  It is following you, but when it sees
enemy(dogs hate bugs, it is common knowledge) it attacks, but dog sees
only 3 cells around. anyway dog's helpful. Btw here is an interesting
thing, if you are dead, dog gets sad and loses hp, but then it goes to
revenge (ony by one, cold-blooded).
There was a bug, I tried hard to fix about a quarter of the day. It
appeared when i was working on dog and it's AI. So I made functions to
reduce that spagetti-like code ( now it is around, not_around). And I
noticed thad dog ignored me and went beat bugs. So it fot stuck, I
coudn't find where the problem is. So debagger saved me, it would be
better if I used it immidiatly. Now it's working nice.
added in ; at ends of lines to remove warnings
Initial commit to uw-groups.
Merge branch 'master' of github.com:allynfolksjr/uw-groups

Conflicts:
	.gitignore
Updated threshold values and tests. Added conditional display of sections to flow
Update to use new slimmer.
Merge branch 'master' of github.com:alphagov/smart-answers
Updates per document.

Includes:
- Copy amends
- Removal of some questions
- Inclusion of half-blood questions

Also re-factored a little to make question variables read 'are there', instead of 'do you have'.
Merge branch 'intestacy'
Notes and JS Plugin
wip ikog
Calculate momentum when chaning omega
Committing the theme
Document Learner
Fix imports for neural tests

Additionally, makes perceptron properties public for access from within the test framework.
Replace obsolete Hashtable with HashMap
[zbhu] add feet and inch unit
updated docs
more updates
small tweaks, still some thigns not working as expected
merge with master
added dispatch_retain/_release for deployment targets less iOS6
added a new post about jekyll blog
bcore/luni: Do not bind for INETADDR_ANY

Do not bind for INETADDR_ANY, connect() will do the same without the
syscall overhead.
Add new constructor to create unbound Datagram socket

Change-Id: I65ae15507555bd161f56f9143a0e313b530a064b
Bluetooth: OPP: Changes to add qcp file format in list of supported files.

Bluetooth OPP service checks list of supported files before accepting a file for
transfer. It tries to get mimetype from the file extension, which requires qcp
format to be added in the list of supported formats.

Change-Id: I2dbf0a5bbe621ec0648645069bdec48bc19000f1
Merge remote branch 'remotes/quic/aosp/ics-mr1-release' into merge_branch
libcore: Fix CTS failure libcore.java.net.OldSocketTest

android.core.tests.libcore.package.libcore.libcore.java.net.OldSocketTest#
test_connectLjava_net_SocketAddress and test_connectLjava_net_SocketAddressI

CRs-Fixed: 326773
(cherry picked from commit 286470b723527ef0ad87afbb142d35b6bd1b4bdf)

Change-Id: I7e5f7221cdce72aca1f92b145bd4097b295408c9
Merge commit 'android-4.0.4_r1.1' into merge_branch

* commit 'android-4.0.4_r1.1':
  Fix for number pattern tests for devices not supporting "ar" locale
  DO NOT MERGE Fix testCalendarSerialization
  Ensure faster OpenSSLSignature is used when possible by doing proper case insensitive comparison
  Don't throw needlessly when returning the CacheResponse.
  Test case for verifier to handle floats that look like boolean.
Libcore : Limit change for directory  path length

Modify test_longReadlink to only test up to a maximum of 159
characters for yaffs2.

CRs-fixed: 330575
(cherry picked from commit be03351ebbf2853a68dee24a939263e372f05753)

Change-Id: Ife83f7d5f27392804b924e60195e1e448cb82e58
Merge branch 'ics_chocolate' of git://codeaurora.org/platform/libcore

Change-Id: I17c757f5b42c5802b7165f2101e2a83800cdbd31
* Switched names from "Switch" to more generic "Sensor"
starting the second file
Check if directory exists for SDK (to handle symlinks correctly)
Merge pull request #5 from ayeung/master

Check if directory exists for SDK (to handle symlinks correctly)
fixed team numbering
Added checkbox to show password in login dialog
odroid-x needs a zImage not a uImage
Atualizado Sweetspot do centro de comando
setting up (and breaking) basic site structure
findByDeviceConfigId was returning single element instead of list
findByDeviceConfigId was returning single element instead of list (auto-gen)
Glucometry was missing
Playing with jin to produce environments.  It appears to work, though I am not quite sure how things nest just yet.
完成CodeUIInfo.java与CodeUIList.java在线调试工作
add CodeUIPageList
Redmine 2.0 compatibility
- fix use of curly braces instead of do/end blocks
isotoma.recipe.django expects django be named 'Django' in [versions]
Merge pull request #14 from atrawog/patch-1

isotoma.recipe.django expects django be named 'Django' in [versions]
Add Andreas in authors
cleaned up my instructions for installing and using Git
Renumbering and cleaning house in preparation for teaching another class.  Aleksey
hibernate: spring hat jetzt die hibernate-connection uebernommen
new directions to develop in
clean up
reverts fmod to older version for os x. fixes rtaudio fmod conflict with latest fmod versions. closes #1694
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
makefile: fix exclude rules. Closes #1702
Merge pull request #1703 from arturoc/fix-makefileexclude

makefile: fix exclude rules. Closes #1702
makefile: previous fix was parsing namefiles for excludes
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop

Conflicts:
	libs/openFrameworksCompiled/project/makefileCommon/Makefile.examples
changing inherited baseApp class from ofBaseApp to ofxAndroidApp
Merge pull request #1709 from thiagohersan/bugfix-androidEmptyExample

changing inherited testApp class from ofBaseApp to ofxAndroidApp
linux: remove some libraries to use them from system
Merge branch 'feature-cross-platform-makefiles' of https://github.com/bakercp/openFrameworks into feature-makefileRefactoring
makefile refactor
makefiles: fix armv7l
Update scripts/linux/fedora/install_dependencies.sh
Update scripts/linux/archlinux/install_dependencies.sh
Merge pull request #4 from bilderbuchi/patch-2

Update scripts/linux/fedora/install_dependencies.sh
Merge pull request #5 from bilderbuchi/patch-3

Update scripts/linux/archlinux/install_dependencies.sh
fix debian install_dependencies
ofConstants: linux, remove unneeded include, was clashing with freeimage
Merge branch 'feature-linuxsystemlibs' of github.com:arturoc/openFrameworks into feature-linuxsystemlibs
makefiles: Rename platform specific config files + merge system libs branch updates
OF compiled: fix cbp files, remove unneded file
Makefile: fix some flags from project config.make + compatibility with old system
makefile_example: fix config.make
makefile_example Makefile
makefile_example, config.make: add OF_ROOT var
makefile_Example, config.make: remove optimization flags
Merge branch 'feature-makefileRefactoring' of git://github.com/arturoc/openFrameworks into feature-cross-platform-makefiles
created zipcode table
added migration for zipcode
created zipcode model
added getCfx.txt for persistence across machines
[maven-release-plugin] prepare release barchart-feed-1.3.24
Added delay trigger and test helpers
Remove the unused tbuilder_gridcell class.


git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@54212 75b3775d-3801-0410-9e12-e2e43121521d
Completing fix for #19486 - no more artifacts in planning mode when path end on other unit.

git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@53929 75b3775d-3801-0410-9e12-e2e43121521d
updated French translation


git-svn-id: http://svn.gna.org/svn/wesnoth/trunk@53962 75b3775d-3801-0410-9e12-e2e43121521d
Clarify 403 http status
Add note on usage with api keys
Add signout + about page + managment pages
Fix settings.py link
deleted the PLATFORMS x86-mingw32 portion of the gemfile.lock file
removing byobu and screen settings
Added colors to separation plot lines.  Booyah.
Adaptacion de UI para diferentes dispositivos
Project99
Merge branch 'master' of https://github.com/betimmehmeti/Project99
Site updated at 2012-11-21 07:21:13 UTC
more icons, updated ImageResource enum and updated references within the
utility project
Finished layout,routes and first sign-up page
Query wieder zurueckgesetzt
update header + footer
added new plugin for widgets
adding blog images
removed generate path data
several improvements and bug fixes to autoscroll
ordering option defaults to false
edge check uses getBoundingClientRect instead of offsets to avoid bug where offsets of edges = 0
Clean up and document
Based database on the novel xbob.db.verification.utils interface; some cleaned up.
Unified driver API; added tests for reverse and path commands.
adde file 4
fix missing quotes on compat-orderbook example
modified everything to accomodate the web GUI
tags file and fix for testing STDOUT
Added basic pelican service data example
don't overwrite /bin/sh
Version management, part 5

Version data can be read from any text file,
in which may also be other data.
Remove warnings about deprecated method
exercise 1.5
exercise 1.6
exercise 1.7
Changing background color to be off-white
renamed psm1
add vimeo functionality
Using cedar now

This reverts commit 24f803dbcd5742bde24816babbf97bab8c5e7dff.
design: set -> set-new. the "set" view will be part of the "detail" modals
Make password access configurable
Make PermitRootLogin a configurable parameter
Validate the values of allow_password and allow_root
fix perms on log files to use postgres user
Finally making this into a real repo
href指定の記述をREADMEに追記
task#2944 - Error in spell checker
#Task 2943 - Não aciona os contatos dinamicos no Responder
Task #3198 - fix translations...
Task#3312 - Translations.
Task#3312 - Fixed translations.
Task #3591 - fix translation for folder name in grid panel (Felamimail) .
Task#3613 - Fix toggle buttons alignment on e-mail compose window.
Task #3643 - fix  translations in addressbook.
Task #3658 - Fix problem on logon when user have another user's subfolder shared with him but not those folders parents.
Task #3723 - fix  addressbook install.
Task#3759 Remove Server information from the account edit dialog.
Task #646 - Remove msgs from trash folder before "N" days.
Task #3762 - Correct crash when user have shared folders and use a filter without folder (search in all folders) in ImapAdapter.
Task #3763 - Search filter without folders returning only 50 results on ImapAdapter.
Task#3892 Change some HTMLpurify configurations to allow the "Overflow" CSS style in email bodys.
Task#3902 - Error in webconference notification
Bugs corrigidos: 3731, 3722, 3546, 3767, 3678, 3680, 3681, 3612, 3223
Task#3914 - Generating milan.20121116.00
Task#3999 - In the search method returns only the IDs of the messages if the parameter $_cols == TRUE.
Task #3872 - Fix problem whem trying to open an .eml attachment.
Merge pull request #2 from bwilk/master

Introduced tests for nginx configuration generation and provided method to remove address from all services
Merge pull request #5 from bwilk/master

REST interfaces corrected
Merge pull request #6 from bwilk/master

REST interfaces corrected
fixed problem with wrong X-Path-Prefix value (correct value: #{context}/#{app}/#{service}
X-Server-Address header added

NoMachine applet need to know the whole path to the webpage
version upgraded into 0.3.1
Merge remote-tracking branch 'upstream/master'
Minor indentation fixes
made the friends work like facebook with requests and the users can either accept or reject a request
merged the conflicts to the add friend page
corrigiendo el json
Adding files.
Merge branch 'master' of github.com:camilasan/qt-bow-arrow
Style changes. Should look fancy now.
modif host et port > Amazon
controlclient: fixing appData
fixed a failed copy/paste
Should really exit all snippets
Asistente habilitado. Corregido fallo en SP que te salia el iniciFrase que habías escrito
Update scripts for OSX
mercado pago step1
remove coremidi as dev dep
bump (v0.1.5)
add "social follow widget in post.html"
add "style.css"
Add .gitignore.
Update setup.py, remove distribute_setup.py usage.

Add nosetests to setup.py via collector.
Refactor for easy new statuses; add statuses.

Refactor webpy_helpers to permit much easier adding of new customized
HTTPError exception classes.

Move basic HTML custom error functionality into a common base class,
letting us specify only the status code and message for each new
error class.

Move basic JSON custom error functionality into an automatically
generated constructor applied via a custom metaclass, allowing us to
create a standardized JSON response corresponding to one of our
HTML HTTPError classes by simply subclassing and setting the correct
__metaclass__ property.

Refactor the tests module to handle a greater number of errors to test:
Rather than manually create three test controllers for each HTTPError
(one for the HTML class, two for the corresponding JSON class, since
we want to test both dict and string error messages via JSON), we now
have a helper function that auto generates these three controller
classes, using `type` to programmatically create classes, given the
base class name being tested, the expected and specified error response
bodies, and the expected status code.

Use this controller creation helper to generate the three required
controllers for each of the (base) error class names in a dictionary
of class names and expected status codes.

Run the list of generated classes (concatenated with the list of manually
written TestController subclasses, if any) as before via a Nose test
generator.

The only change to test execution is that we can now expect JSON
response bodies; if so, we'll attempt to JSON decode the recieved
error response body before comparing the resulting Python dict to the
"expected" dict specified in the test controller class.
slideshow updates with drawing
initialize maven project
added script for RTP ProjectList view
added log message at startup
Modified parsing section
Issue #705: Add a test
remove stupid negative exponent comment
Util: now that variadic params are Sequential, made all toArray methods that take List public
Container: fixed alias
Ranged: made methods shared
DynamicNode from V5 doc and V4 Cheat Sheet
templateHeader styles moved inline
meow added
Outline
Test emacs magit
modification for library.py
Styles Supplier sectin of the Create Purchase Order Page
pass a few tests until READDIR
Added User Resource

Automatically Generated
Minor changes. Possible fix for box drawing on the way?
fix breadcreumbs on mobile. Don't show 'branches' information. under save button on hover
added ILR header link
edit homepage message on mobile interface using jquery (alos removed unrequired javascript file load from footer)
css fixes for headerlinks. mobile tweaks. removed extra div tag in footer
add an extra message to the mobile homepage. mobile tagline line spacing tweaked
homepage edit
config.ini for mobile. not yet uploaded.
pretty sure I've already committed this twice
Continue work on XSlides.
mongoid 3.0 fix
allowing object before hash mongoid3.0 fix
just writers
Merge pull request #14 from hookercookerman/mongoid3.0

mongoid 3.0 fix
Make sure that something gets outputted when a load is successful
Revealed hrs in guides.
Updated readme to use markdown instead of rst.
By default, proceed wizard even if the empty storage space is small
Making a new Person object. Testing is happening
Added colors and testing
Added score
Merge branches 'work' and 'master'
Site updated at 2012-12-15 08:45:39 UTC
Update notes for submitted changes

* Streamlined and clarified help commands
Update notes for submitted changes

* fix yaml syck issue in ruby 1.9.3
corrected multiple file read errors
updated README, MD formatting
Update JelenikMercerModelRetrieval.py
added favicon & changed font
added bling folder

assets>img>bling
new fruitstand gif
trying again
Few more changes to github auth.
Cambie base_url para probar en maquina
Finished the base model and controllers
random_adjective()
moved init hook out of sb constructor so global  will be assigned
more tests (stylesheet_spec.rb)
teacup update
stylesheet spec updates, added view_spec tests
Fix home/end/delete
Fix for font issue in Chrome on Windows.
fabfile
adding time to the kwargs
roles.py
reqs
roles reqs
[*27166731] mousedown and hold => continuous change

Continued mousedown on a Hotter/Colder button should produce
continued changes
Gemfile: bourbon update

update bourbon mixin library for Sass to 2.1

http://thoughtbot.com/bourbon/

Procedure used to update bourbon in Lab repo after updating
Gemfile and running bundle install:

  cd src/sass/
  bourbon update
Use SASS variable $directory to indicate levels-deep

This makes relative url references in sass/css work
more simply for more deeply nested directories.
move Lennard-Jones page to doc/models/md2d

The doc directory structure now more closely resembles
the src/lab directory structure.
copy Simple Atoms application.js

REFACTORING needed to lessen this kind of duplicated code
simple styling update to fix problems
integrate more Lab styling into NetLogo experiment
Fix wrong function name in interactives-controller
lint fixes
engine.angularBonds is a hash, not array
Don't need engine.x, etc. since we have atoms.x...
rm redundancy: engine.angularBonds===angularBonds!
Use symfony 2.0 stable as base
track missing features
CCBC-107 Port test from http://review.couchbase.org/13667

Reference: http://review.couchbase.org/#/c/13667/12/tests/smoke-test.c
Change-Id: Ia2fb0c99dd3759ed56bd9a508e3810bc45388457
Reviewed-on: http://review.couchbase.org/22585
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Mordechai Nunberg <mnunberg@haskalah.org>
fix charset??
Resolved bug in install script: directory structure not correctly initialized when choosing default local directory in interactive mode.  (Resolves VUFIND-697).
Hide SMS provider dialog when only one option is present.
Smarter selection of call number / location in SMS messages.
Bug fix: clear call number when setting backup location.
Removed unused namespace use declarations.
Fixed bad class references.
Simplified and improved package building.
Make record drivers non-shared plugins in order to eliminate clone() calls throughout the code.
Added comment.
Fixed comment.
Changed statistics driver plugin manager to return non-shared instances; eliminated explicit cloning.
Added some UserList-related DB table tests.
Improved comment; use createRow() convenience method instead of verbose cloning.
Eliminated explicit cloning of related/recommendation modules by making plugin managers smarter.
Improved inline script generation.
Style fix.
Fixed typos in comments.
Switched to more appropriate marker interface.
Switched to more appropriate marker interface; added some missing property comments.
More appropriate abstraction (throw exception instead of dying with non-object error if table manager not assigned).
Setting current user execution policy to remote signed.
Import (test unit-test)
off-by-one error fixed
I really need a local markdown previewer.
some commands used in demo
Started problem4
implement html5 video player prototype
OGM-158 Make sure OGM does not override ORM settings when not explicitly used
OGM-158 Remove unused imports and fix typo
OGM-160 Invalid persistence unit configuration might result in NullPointerException
update version in readme.md to not confuse github users
OGM-132 Integrate MongoDB
OGM-132 MongoDB module requires Search dependencies for tests
Have it compile
OGM-132 Use type overriding feature of OGM-142 to use a different type mapping for Calendar and Byte for BuiltInTypeTest to pass
OGM-139 implement the drop database to clean data stored by the test
suite
OGM-147 Start documentation on mongodb
OGM-132 Exclude tests for unsupported feature
OGM-143 Use findAndModify to implement nextValue
OGM-147 Update project documentation with the mongodb implementation
OGM-144 MongoDB associations
OGM-144 undo some small changes that shouldn't have been committed to MongoDBTupleSnapshot. fix endsWith check on _id to include . prefix. add ToString on AssociationTupleSnapshot. construct DBObject with size instead of HashMap for columnNames+columnValues.
OGM-144 move associations into collections prefixed with associations_, eg. associations_BlogEntry
OGM-144 MongoDB associations: style and whitespaces
OGM-144 Avoid some autoboxing
OGM-162 Have an option to build the project without requiring a running MongoDB instance
OGM-163 Implement a @SkipByGridDialect test helper annotation
fix typo on versions variable name
sort available doc versions using NormalizedVersion
Merge remote branch 'dangra/version-sorting'
Fix import to be app-relative.
Added dangra to the authors file.
Fix formatting.
Derp.
Switch to using pyquery for some parsing.
Try and fix the BB post-commit hook.
Use raw_id_field for users in admin.
Merge remote branch 'alex/master'
Remove BS from reqs.
cleanup fabfile.
Hack full_deploy
Catch ImportedFiles that don't exist.
Added Alex Gaynor to the authors, and fix my code.

Thanks Alex!
Log error in bitbucket post-commit.
Add bitbucket to the post-commit hook docs.
Fix valueerrors on pyquery.
Update the authors file with missing folks. Sorry!
adding config files for restforce
added vagrant to oh-my-zsh plugins
after transition from waiting_funds to successful or failed should notify_observers
fixing user's projects styles
put links in comun and engage logos
rewrote condition for update form display using cancan
updated factory_girl version
moved advert_videos spec to institutional_video and put it's factory inside factories.rb
subs for blog in acceptance back project
refactoring the credits acceptance spec
fixing some bugs
clear deliveries before tests
Merge branch 'develop' of github.com:danielweinmann/catarse into refactoring
moved the app/stylesheets/redesign/ to app/assets/stylesheets/
removed the old stylesheets
handle subsystem=bdi udev events. call scan_zpools() on bdi events. fixes bug 348
Update gem file to include PostgreSQL
Refactoring implementation of Optimized Algorithm
just redriect back